refactoring & update README