Refactoring done.