more cleanup to math