Prompt refactor