Handled All review comments