Update README. Make some refactoring