Refactoring Mathematics structs...