Trying out etc environment setters
Moved environment variables to conditionals
Removed trailing quote