Massive overhaul, basically just cleaning up beautifying the code ready for turning it into irc-factory