Little refactor
Update readme