Cleanup of NonBlockInput classes
More cleanup and reorganization