Refactoring master

More master refactoring.

Let's see what ye ol' Jenkins has to say about this.
This just got pulled over from old code. I've changed. Great catch! Thank you.