Some refactoring for ENUMs and new method removeDuplicates with tests.