Improve environments
Improve code