Fix initialization
Simplify environment setup