Clean up the end bits of assignment 2