Remove unnecessary duplication in views