Refactor with BigMath