Improving on css and class markup