Inline method and simplify logic

It's a little bit random refactoring this! It was just something I came across while I was trying to understand some other code and I couldn't help myself.

(Somewhere in the back of my mind I hope that we do enough small things like this and over time the code size will go down massively)