Reindented the code
Enums and whitespace