Remove duplication from views