Fixed prompts and added some structure