Assignment 2 - cleanup