Some lazy refactoring.