Refactor styleguide