Refactoring prompts to be more clear