Tidied up Temperature Values Map

Refactored Temperature Values map.  Better naming conventions.  Split
responsibilities into seperate methods etc.