cleanup and merge with two finger code