changes from review suggestions