Improve the math a bit