restructuring stylesheets (more modular)