Cleaning up and beginning to automate html creation