cleaned up views with helpers