cleaned up code from part 1
blerg