code style, comments, refactoring