diff --git a/jsonlog/jsonlog_marshalling.go b/jsonlog/jsonlog_marshalling.go
index 6244eb0..abaa8a7 100644
--- a/jsonlog/jsonlog_marshalling.go
+++ b/jsonlog/jsonlog_marshalling.go
@@ -65,8 +65,7 @@ import (
 func (mj *JSONLog) MarshalJSON() ([]byte, error) {
 	var buf bytes.Buffer
 	buf.Grow(1024)
-	err := mj.MarshalJSONBuf(&buf)
-	if err != nil {
+	if err := mj.MarshalJSONBuf(&buf); err != nil {
 		return nil, err
 	}
 	return buf.Bytes(), nil
diff --git a/mflag/flag.go b/mflag/flag.go
index f2da1cd..f0d20d9 100644
--- a/mflag/flag.go
+++ b/mflag/flag.go
@@ -486,8 +486,7 @@ func (f *FlagSet) Set(name, value string) error {
 	if !ok {
 		return fmt.Errorf("no such flag -%v", name)
 	}
-	err := flag.Value.Set(value)
-	if err != nil {
+	if err := flag.Value.Set(value); err != nil {
 		return err
 	}
 	if f.actual == nil {
diff --git a/system/lstat.go b/system/lstat.go
index a966cd4..d0e43b3 100644
--- a/system/lstat.go
+++ b/system/lstat.go
@@ -12,8 +12,7 @@ import (
 // Throws an error if the file does not exist
 func Lstat(path string) (*Stat_t, error) {
 	s := &syscall.Stat_t{}
-	err := syscall.Lstat(path, s)
-	if err != nil {
+	if err := syscall.Lstat(path, s); err != nil {
 		return nil, err
 	}
 	return fromStatT(s)
diff --git a/system/stat_linux.go b/system/stat_linux.go
index 928ba89..3899b3e 100644
--- a/system/stat_linux.go
+++ b/system/stat_linux.go
@@ -20,8 +20,7 @@ func fromStatT(s *syscall.Stat_t) (*Stat_t, error) {
 // Throws an error if the file does not exist
 func Stat(path string) (*Stat_t, error) {
 	s := &syscall.Stat_t{}
-	err := syscall.Stat(path, s)
-	if err != nil {
+	if err := syscall.Stat(path, s); err != nil {
 		return nil, err
 	}
 	return fromStatT(s)
diff --git a/timeoutconn/timeoutconn.go b/timeoutconn/timeoutconn.go
index 3a55455..d9534b5 100644
--- a/timeoutconn/timeoutconn.go
+++ b/timeoutconn/timeoutconn.go
@@ -17,8 +17,7 @@ type conn struct {
 
 func (c *conn) Read(b []byte) (int, error) {
 	if c.timeout > 0 {
-		err := c.Conn.SetReadDeadline(time.Now().Add(c.timeout))
-		if err != nil {
+		if err := c.Conn.SetReadDeadline(time.Now().Add(c.timeout)); err != nil {
 			return 0, err
 		}
 	}