Refactoring, code style