Code cleanup
Refactoring, what could possibly go wrong? :D All tests green.
Overview bug. This should work.