Refactored all the files
Refactored everything
Working on env function