Remove usage of environment variable in the library
Severe refactoring
Updates README