identation of the code and removing old queries