I think I agree with you both. I’m not a Node developer; could you keep your SQL objects/components in a separate file so that they don’t clutter up other logic?