added Snake and cleanup