Rename compile phase methods
Remove redundant class
Refactor to use rich iterable
Refactoring