Tidying up Location deserialiser class in preparation for extraction to a seperate file