Removed extra math operations