Added modifications recommended by ShellCheck