Cleanup
Code for last submission