beginning refactoring to DRY views