kotlin version refactoring