Improved math operations