Code Clean-up after submission