[Minor] cleaaned up StrolchEnum, using map to store values