Tidy up highlight CSS formatting