Cleaned up my code so that it works

Merged 2 step def files to correct errors in the code.