Added more godoc + minor matcher variable renaming