css tidy up and annotate