Finishing prior refactoring.