Removed unneeded import.
Editorial
Try to use uppercase everywhere for key type.
Try to use uppercase everywhere for key type.
Fixed a couple of things left behind during the first lap.