Continue refactoring according to coding style