Update readme and improve code style