Java to Kotlin converter: code refactorings after review