shellcheck cleanup