Perform smaller cleanups
Add comment to snail init