Proposed tidying-up of custom html