Refactoring to minimize bulk.