refactoring, fix readme