Renamed to PSR2 standards + partial refactor of addQuery()