made code more dry in touch and motion