More style fixes
Use gerunds in questions