More Cleanup + HTML work