Constructor duplicates resetQuery() code

Right now constructor contains all the lines which `resetQuery()` method minus intermediate var-name quirks. This pull-request fixes this + adds better pep8 compliance (just for related methods) + removes a tiny piece of dead code