indentation fixes, helper refactor

Minor improvements to html