NOJIRA: code cleanup, two helper shell scripts