Improve README, done some refactoring