Removed dependency on NumPy