Merge: Niti: small refactoring