Refactored disambiguation method and extracted into own module