cleaned up env variables
More code refactoring