Cosmetic / stylistic 'refactoring' of step defs