some final refactoring in multitouch