Cleanup, streamlining.

Based on DHT22 development