Moved measurement temp calc to init of class
various spacing tidy ups