Simplify code
Small refactorings
Update readme