Removed some excess code, cleaned up prompts