diff --git a/proto/runtime/src/main/kotlin/CodedInputStream.kt b/proto/runtime/src/main/kotlin/CodedInputStream.kt
index 371e5d99890..5474b90fcc4 100644
--- a/proto/runtime/src/main/kotlin/CodedInputStream.kt
+++ b/proto/runtime/src/main/kotlin/CodedInputStream.kt
@@ -1,4 +1,3 @@
-package main.kotlin
 /**
  * Created by Dmitry Savvinov on 7/6/16.
  *
diff --git a/proto/runtime/src/main/kotlin/CodedOutputStream.kt b/proto/runtime/src/main/kotlin/CodedOutputStream.kt
index 2c0818d352a..a55d5a9f2c7 100644
--- a/proto/runtime/src/main/kotlin/CodedOutputStream.kt
+++ b/proto/runtime/src/main/kotlin/CodedOutputStream.kt
@@ -1,4 +1,3 @@
-package main.kotlin
 /**
  * Created by user on 7/6/16.
  */
diff --git a/proto/runtime/src/main/kotlin/KotlinInputStream.kt b/proto/runtime/src/main/kotlin/KotlinInputStream.kt
index c2d592a729b..2919b1af0ce 100644
--- a/proto/runtime/src/main/kotlin/KotlinInputStream.kt
+++ b/proto/runtime/src/main/kotlin/KotlinInputStream.kt
@@ -1,4 +1,3 @@
-package main.kotlin
 /**
  * Created by user on 8/8/16.
  */
@@ -14,4 +13,4 @@ class KotlinInputStream(val buffer: ByteArray) {
     fun isAtEnd(): Boolean {
         return pos >= buffer.size
     }
-}
\ No newline at end of file
+}
diff --git a/proto/runtime/src/main/kotlin/KotlinOutputStream.kt b/proto/runtime/src/main/kotlin/KotlinOutputStream.kt
index 9b2714e17b2..51f80aaf766 100644
--- a/proto/runtime/src/main/kotlin/KotlinOutputStream.kt
+++ b/proto/runtime/src/main/kotlin/KotlinOutputStream.kt
@@ -1,4 +1,3 @@
-package main.kotlin
 /**
  * Created by user on 8/8/16.
  */
diff --git a/proto/runtime/src/main/kotlin/WireFormat.kt b/proto/runtime/src/main/kotlin/WireFormat.kt
index d98ec546b5b..628328e124c 100644
--- a/proto/runtime/src/main/kotlin/WireFormat.kt
+++ b/proto/runtime/src/main/kotlin/WireFormat.kt
@@ -1,8 +1,3 @@
-package main.kotlin
-/**
- * Created by user on 7/6/16.
- */
-
 
 object WireFormat {
     // couple of constants for magic numbers
diff --git a/proto/runtime/src/main/kotlin/WireType.kt b/proto/runtime/src/main/kotlin/WireType.kt
index d01e9d550ab..4ffc150fa68 100644
--- a/proto/runtime/src/main/kotlin/WireType.kt
+++ b/proto/runtime/src/main/kotlin/WireType.kt
@@ -1,4 +1,3 @@
-package main.kotlin
 /**
  * Created by Dmitry Savvinov on 7/6/16.
  * Enum for possible WireTypes.
@@ -15,7 +14,7 @@ enum class WireType(val id: Int) {
     UNDEFINED(6);           // indicates error when parsing from Int
 
     companion object {
-        fun from(value: Byte): WireType {
+        fun from (value: Byte): WireType {
             return when (value) {
                 0.toByte() -> VARINT
                 1.toByte() -> FIX_64