HTML and CSS clean up