Additional Cleanup. Allow user to match knife exit code