Removed types from usage of math classes (in support of #13 and #14)