Improve EnvironmentFolder Class

There may be ways to improve the EnvironmentFolder class.

• It performs 3 queries. It may be possible to collapse this into a single query.
• The code is complex and it may be possible to make it more readable and easier to understand.

See this conversation: !15191 (comment 215066214)