Started refactoring the alias checking code on ScoopDetection