Cleaning up view duplication"