refactoring and indent | styleguide