Cleanup;
thermostat and irrigation load and save;
Some refactoring