Code and html cleanup.