Remove extra comment, reorder query