CSS clean-up