Final Clean-up of code, preparing for submission