Improve html and css readability and remove old code