Moved environment variable declarations