edit readme.md and refactoring