CSS refactoring, cleaning up, whitespace