cleaned up and refactored the html