further cleanup of vars/method terminology