Slight refactoring for the clean.