RPBI: more refactoring + variable names.