Pyon code cleanup
Pyon code cleanup

ooici/pyon,mkl-/scioncc,crchemist/scioncc,scionrep/scioncc,mkl-/scioncc,crchemist/scioncc,scionrep/scioncc,ooici/pyon,mkl-/scioncc,scionrep/scioncc,crchemist/scioncc