Styleguide refactoring