Moving towards a tidy CSS