Continuing to make things DRY