Refactor the script
Update README