Further cleaning

Rearranged some more stuff, there's whole methods in this class that do
NOTHING o.O