Cleaned up views per Jonathan's review.