Refactored some html