Remove trailing spaces
Put variables in {}
Fix indentation, quoting