Removed redundant step() code, made some stuff more readable.