Removed commented out html, general clean up