Cleanup in SnakFactory

Change-Id: I51ec0578f019a5be32e02c44509ab1619ad012bc
Merge "Cleanup in SnakFactory"