Cleaning up enum handling - default should be throwing exception instead of doing nothing

This cleans up enum handling:
- all-in-one-line declarations
- doing nothing when an unhandled enum value is encountered
- inconsistent indenting