Refactoring and code cleanup

- Main cleanup in touch listener