Refactor
Update readme