Cleaning up how out environment should work