apply comments

Thank you for review!