POLYINT: small refactor, abstract some stuff out
Improve readability