Refactor method names
Update README