Stylesheet refactoring