Refactoring code style