Cleaning up Step a bit