Cleanup
Adding function wrapper for numpy arrays