Refactor touches