Step three in implementing sandworms

Removed/fixed comments