refactorings suggested by ShellChecker, quotings, etc.