(orcc-lib) Code cleaning.