Refactor of Intersection class