Refactoring the stylesheets class a bit more