Major refactor of input args, kwargs processing