Tidying up the CSS