Merge: nitdoc: refactoring and cleaning