Beautified the map-type and optimised the key/val variables