Cleaning up part 2