Updated code to work with the CI version of incquery
Executed code formatting