whitespace/html cleanup