Refactored Steps file to move most of logic in to helper files.