Removed unecessary stuff and fixed an issue with prompt