Slight simplification of CSS