Marginally cleaner HTML