Housekeeping and refactoring.