Basic refactoring.