cleanup based on feedback