Continue to make code DRY and streamline views