tidies in response to @demobox 's code review