Refactor various prompt methods to be more DRY
Minor changes