More code cleanup

Prep before building math function/method