code cleanup, added html intendation