Refactored dry views