More tidying re $wpdb->prepare