Clean up dataq.js code