Cleaned up collection view touch events