Refactoring, changed README.md