Code cleanup
More code cleanup
Removed unnecessary hrefs
Code cleanup