NOJIRA some code cleanup and formatting