Cum help me clean up part 2