Clean-up and updated version of Kotlin