Minor WS fixes
Minor WS indentation fixes
Remove superfluous environment variable.

Instead of localizing it.