Simplify organization of stylesheet