fixed up by the review suggestions