Refactor codes
Update README