clean up expand_args for code beauty only

clean up expand_args for code beauty only