NOJIRA code cleanup.  making logging consistent.