Commiting refactoring.