Applied comments from review