Continued the grand refactoring saga.