Continuing refactoring.