Cleanup before assignment 3