Functional but not optimized refactor to direct views