Improve gerund vs. infinitive
Extract gerund and infinitive