styleguide refactoring