Cleanup, made MotorStep and FS Rename