Refactoring styleguide