Refactored Environ creation a bit