25 - refactoring to reduce number of parameters to intersection calculation methods