Cleaned up in the view a bit.