remove tabs, extra parameters

Trying again, still lots of errors.  I always forget how to deal with
"not declared in this scope"