Tortoise: add comment
Tortoise: shuffle some code around