Add reading an envvar to use with cluster names

Indent added and unneeded braces removed