Clean up

Cleaned up some of the prompts