Improve math usage