Some tidyups to snake.  Still doesn't reset properly at the end.