Correction for word barrel
Further code cleanup due to SITC changes