NOJIRA Various minor changes, spelling mistakes corrected, coding standards and code formatting