Formatting and Cucumber step/support refactoring.