Update readme and change function names