Final Clean up of code