Cleaned up code, fixed roll on entire floor