Renaming variables, restructuring html demo