Some refactoring, I <3 Enumerable