Fixed review comments 2