Trim redundant lines and commands
Add missing sudo command to bootstrap.sh