Clean up and modularize stylesheets