Refactoring master

More master refactoring.

Let's see what ye ol' Jenkins has to say about this.
pylint is lying, they should be 8 spaces as defined by pep8 (so it does not confuse the block flow visually) Thanks :)