Added Minus method, removed static calls to class methods