Math clean up