Finished the PyOCNI Reform