Avoid prima donna method

As highlighted by Reek:
https://github.com/troessner/reek/wiki/Prima-Donna-Method
Merge pull request #8 from andyw8/avoid-prima-donna-method

Avoid prima donna method