refactoring with codestyle