Clean up based on review