More refactor
Update README