Simplify environment variable handling