Refactor library
Update readme