Tried to tidy up user prompts