further code cleanup
further code cleanup
Bunch of cleanups and post processor rename