refactor out tap converter