small final cleanup for hw2