cleaning up - part 2