Pyon code cleanup
Pyon code cleanup

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