Help me clean up part 17