NOJIRA Code cleanup