cleanup
refactoring: code, file names