cleanup review suggestions