variety of code and html cleanup