Assignment 5 clean up