code cleanup
new new query