Refactor and improvements
Update README.md