cleanup based on review