Eliminate dead code, unnecessary comments, additional cleanup
Better function grouping in view controller
Rudimentary hover state handling