improve using env variable