Refactored out some html