implementing comments from review