cleanup and refactoring
1 file changed