Slight refactoring for ground fitting