Cleanup HTML. Moved to controller