Fixed review comments from pareview.sh