cleanup and refactor
Merge pull request #7 from apelade/steps_refactor

cleanup and refactor features and steps