NOJIRA: minor code cleanup