fix instance var names for remote invocation
cleanup