Fix indentation
Remove EmptyEnumeration
Fix style and indentation