Small refactoring of new gesture methods and classes