Further cleanup, formatting, and organizing of CSS.