Refactored prompts a bit