Refactor
Update README