Refactoring the FixSources profile