Minor refactoring
Update ToDos
Refactorings
Make "enum" immutable