Myles review

Refactoring after code review with @quackingduck