Refactoring volunteer op

Following my TIMO cucumber refactor, I'm giving the volunteer op the same treatment.  Some good tips on refactoring cucumber steps here:

http://coryschires.com/ten-tips-for-writing-better-cucumber-steps/

At the moment I'm editing the feature for consistency.