Separated water and air sensors. Cleaned up some code