Clean-up touch event handling a little