NOJIRA code cleanup
58 files changed