Refactoring mid-way.