Fixing enums and {}. A bit of cleanup