Whitespace improvements; populate environment then convert to list