cleaned up some things for part 3