cleanup suggestions from before