Refactored Untangle into class modules