Cleaned up env namespace