Add sparsify switch
More argument parsing robustification
Replace legacy code