[AUSTIN] removed self-assign, removed unused err var, ...

made some minor changes