Tidy the code a bit
Tidy the code a bit

Make the key type enum private and add some MARK comments

sealz/Heimdall,nathankot/Heimdall,sealz/Heimdall,henrinormak/Heimdall,nathankot/Heimdall,navisingh/Heimdall,henrinormak/Heimdall,navisingh/Heimdall