clean up part 1
clean up part 2