Minor code cleanup. HashMap -> Enum