Cleaned up Motors Sensors code