cleaning up part 1