implemented comments from review