all sensors working and cleaned up some code