Simplify code slightly.
Update readme