code layout, renaming refactoring, comments