Prompt

Refactor and update prompts

ref to #6