Refactor Following Views and Collections