Preliminary clean-up of HTML module