Java to Kotlin converter: minor code refactorings after code review