NOJIRA: code cleanup, getting rid of comments, etc.