Cleaned up model to look nice for presentation