Clean-up.

These are changes I would want to talk about if the code where created in a pull request. Feel free to challenge or question any of them -- I would be more than happy to explain my reasoning. Overall it looks really good though!
Much better, yeah.