minor html cleanup and function rename