Cleanup entry and handle argument