Made versus view a little cleaner