restructure and clean up some code
restructure and clean up some code

mtezzele/dealii,JaeryunYim/dealii,ESeNonFossiIo/dealii,JaeryunYim/dealii,andreamola/dealii,YongYang86/dealii,EGP-CIG-REU/dealii,ibkim11/dealii,natashasharma/dealii,adamkosik/dealii,sairajat/dealii,andreamola/dealii,pesser/dealii,Arezou-gh/dealii,sairajat/dealii,msteigemann/dealii,naliboff/dealii,spco/dealii,mac-a/dealii,shakirbsm/dealii,rrgrove6/dealii,sairajat/dealii,Arezou-gh/dealii,adamkosik/dealii,lpolster/dealii,angelrca/dealii,mtezzele/dealii,adamkosik/dealii,nicolacavallini/dealii,lue/dealii,johntfoster/dealii,ESeNonFossiIo/dealii,YongYang86/dealii,ibkim11/dealii,Arezou-gh/dealii,maieneuro/dealii,gpitton/dealii,jperryhouts/dealii,danshapero/dealii,danshapero/dealii,naliboff/dealii,angelrca/dealii,lpolster/dealii,mac-a/dealii,angelrca/dealii,sriharisundar/dealii,sairajat/dealii,andreamola/dealii,naliboff/dealii,lpolster/dealii,EGP-CIG-REU/dealii,lpolster/dealii,kalj/dealii,nicolacavallini/dealii,naliboff/dealii,shakirbsm/dealii,flow123d/dealii,johntfoster/dealii,sriharisundar/dealii,sriharisundar/dealii,msteigemann/dealii,lue/dealii,jperryhouts/dealii,danshapero/dealii,mac-a/dealii,mtezzele/dealii,flow123d/dealii,nicolacavallini/dealii,lpolster/dealii,kalj/dealii,spco/dealii,naliboff/dealii,spco/dealii,ESeNonFossiIo/dealii,sairajat/dealii,JaeryunYim/dealii,Arezou-gh/dealii,Arezou-gh/dealii,flow123d/dealii,maieneuro/dealii,shakirbsm/dealii,ibkim11/dealii,rrgrove6/dealii,JaeryunYim/dealii,jperryhouts/dealii,nicolacavallini/dealii,natashasharma/dealii,spco/dealii,pesser/dealii,gpitton/dealii,mtezzele/dealii,adamkosik/dealii,sriharisundar/dealii,danshapero/dealii,JaeryunYim/dealii,ibkim11/dealii,danshapero/dealii,gpitton/dealii,pesser/dealii,ESeNonFossiIo/dealii,rrgrove6/dealii,ibkim11/dealii,jperryhouts/dealii,johntfoster/dealii,EGP-CIG-REU/dealii,kalj/dealii,sairajat/dealii,jperryhouts/dealii,kalj/dealii,pesser/dealii,andreamola/dealii,mac-a/dealii,shakirbsm/dealii,JaeryunYim/dealii,lue/dealii,andreamola/dealii,maieneuro/dealii,spco/dealii,natashasharma/dealii,msteigemann/dealii,nicolacavallini/dealii,natashasharma/dealii,maieneuro/dealii,YongYang86/dealii,andreamola/dealii,mtezzele/dealii,YongYang86/dealii,YongYang86/dealii,sriharisundar/dealii,YongYang86/dealii,mac-a/dealii,angelrca/dealii,pesser/dealii,jperryhouts/dealii,EGP-CIG-REU/dealii,angelrca/dealii,msteigemann/dealii,johntfoster/dealii,JaeryunYim/dealii,danshapero/dealii,flow123d/dealii,mtezzele/dealii,EGP-CIG-REU/dealii,msteigemann/dealii,mac-a/dealii,lue/dealii,shakirbsm/dealii,natashasharma/dealii,msteigemann/dealii,naliboff/dealii,msteigemann/dealii,kalj/dealii,shakirbsm/dealii,sairajat/dealii,maieneuro/dealii,flow123d/dealii,flow123d/dealii,lpolster/dealii,Arezou-gh/dealii,ibkim11/dealii,kalj/dealii,lue/dealii,ibkim11/dealii,mtezzele/dealii,ESeNonFossiIo/dealii,mac-a/dealii,flow123d/dealii,gpitton/dealii,Arezou-gh/dealii,YongYang86/dealii,gpitton/dealii,rrgrove6/dealii,natashasharma/dealii,spco/dealii,ESeNonFossiIo/dealii,shakirbsm/dealii,sriharisundar/dealii,lpolster/dealii,johntfoster/dealii,sriharisundar/dealii,rrgrove6/dealii,jperryhouts/dealii,lue/dealii,adamkosik/dealii,angelrca/dealii,ESeNonFossiIo/dealii,adamkosik/dealii,natashasharma/dealii,spco/dealii,nicolacavallini/dealii,adamkosik/dealii,kalj/dealii,lue/dealii,angelrca/dealii,pesser/dealii,rrgrove6/dealii,maieneuro/dealii,maieneuro/dealii,rrgrove6/dealii,gpitton/dealii,johntfoster/dealii,gpitton/dealii,EGP-CIG-REU/dealii,pesser/dealii,danshapero/dealii,johntfoster/dealii,andreamola/dealii,naliboff/dealii,nicolacavallini/dealii,EGP-CIG-REU/dealii