Prompt changes + cleanup