- Continued Prompt refactoring