Make Y/N prompting more consistent