Assignment 3 Cleanup