Improved nfindr code
Made the initial random sample code more concise
More minor code cleanups