Fix + Refactoring PROMPT