Tidying CSS,  preparing for CSS separation/refactoring