NORJIRA: code cleanup, improved READMEs