Refactor PROMPT