Simplify SnakFinder

Change-Id: I0b17944523d7f297b2ae9fd036af3267e98ddc15