Refactoring ProfileCreationService to feed hound