cleaned up model for presentation