added braces/quotes for env vars, fixed spacing