clean up, fix html generation