diff --git a/ioctl_solaris.go b/ioctl_solaris.go
index f63985f..249686c 100644
--- a/ioctl_solaris.go
+++ b/ioctl_solaris.go
@@ -1,15 +1,16 @@
 package pty
 
 import (
-	"golang.org/x/sys/unix"
 	"unsafe"
+
+	"golang.org/x/sys/unix"
 )
 
 const (
 	// see /usr/include/sys/stropts.h
-	I_PUSH  = uintptr((int32('S')<<8 | 002))
-	I_STR   = uintptr((int32('S')<<8 | 010))
-	I_FIND  = uintptr((int32('S')<<8 | 013))
+	I_PUSH = uintptr((int32('S')<<8 | 002))
+	I_STR  = uintptr((int32('S')<<8 | 010))
+	I_FIND = uintptr((int32('S')<<8 | 013))
 	// see /usr/include/sys/ptms.h
 	ISPTM   = (int32('P') << 8) | 1
 	UNLKPT  = (int32('P') << 8) | 2
diff --git a/pty_solaris.go b/pty_solaris.go
index 09ec1b7..5c37972 100644
--- a/pty_solaris.go
+++ b/pty_solaris.go
@@ -6,11 +6,12 @@
 
 import (
 	"errors"
-	"golang.org/x/sys/unix"
 	"os"
 	"strconv"
 	"syscall"
 	"unsafe"
+
+	"golang.org/x/sys/unix"
 )
 
 const NODEV = ^uint64(0)
@@ -45,13 +46,13 @@
 	t := os.NewFile(uintptr(slavefd), sname)
 
 	// pushing terminal driver STREAMS modules as per pts(7)
-	for _, mod := range([]string{"ptem", "ldterm", "ttcompat"}) {
+	for _, mod := range []string{"ptem", "ldterm", "ttcompat"} {
 		err = streams_push(t, mod)
 		if err != nil {
 			return nil, nil, err
 		}
 	}
-	
+
 	return p, t, nil
 }
 
@@ -129,7 +130,7 @@
 	// https://www.illumos.org/issues/9042
 	// but since we are not using libc or XPG4.2, we should not be
 	// double-pushing modules
-	
+
 	err = ioctl(f.Fd(), I_FIND, uintptr(unsafe.Pointer(&buf[0])))
 	if err != nil {
 		return nil
diff --git a/util_solaris.go b/util_solaris.go
index e889692..8f9731c 100644
--- a/util_solaris.go
+++ b/util_solaris.go
@@ -4,6 +4,7 @@
 
 import (
 	"os"
+
 	"golang.org/x/sys/unix"
 )
 
diff --git a/ztypes_openbsd_32bit_int.go b/ztypes_openbsd_32bit_int.go
index d7cab4a..9c0e4b1 100644
--- a/ztypes_openbsd_32bit_int.go
+++ b/ztypes_openbsd_32bit_int.go
@@ -4,10 +4,10 @@
 package pty
 
 type ptmget struct {
-	Cfd	int32
-	Sfd	int32
-	Cn	[16]int8
-	Sn	[16]int8
+	Cfd int32
+	Sfd int32
+	Cn  [16]int8
+	Sn  [16]int8
 }
 
 var ioctl_PTMGET = 0x40287401