Code cleanup
Started on CSS.