cleaned up Assignment #2