Nice refactoring done.