refactorign
env variables