Small refactoring
Update readme