This makes the environment creation and management clearer.
Fixes #565 (closed)
This will create a new commit in order to revert the existing changes.
