cleaning up where.js