NumPy cleanup

Just some minor things about NumPy.