Minor changes based on feedback from shellcheck.