General cleanup as I move towards the detail view implementation