CSS styleguide cleanup