Help me clean up part 18