html cleanup and data controllers