apply some more review suggestions