Cleanup for HW3