Added TempConverter
Tidy up
Added TempConverter
Cleanup