HTML cleanup and scope discussion