css and markup cleanup