cleanup of math, much more const now