I took away the need to re-instance a DriveState object in order to make the orientation return to the default state when re-enabling teleop. This should make the code more efficient.