Refactoring master

More master refactoring.

Let's see what ye ol' Jenkins has to say about this.
Pylint told me otherwise. I can put them back though.