MNT : cleaned up numpy usage