feat: maths cross function minor refactor (still in process)