Cosmetic change, and fix the dependency loop for file