implemented suggestions from review