Clean up; added proper query bind