Refactor lib
Update README