Address @elemoine comments: s/touch/touchDevice/
Remove trailing spaces
Merge pull request #625 from geoadmin/dev_following_509

Address @elemoine comments from #509