diff --git a/journald/journald.go b/journald/journald.go
index 16b7562..ce3a382 100644
--- a/journald/journald.go
+++ b/journald/journald.go
@@ -68,7 +68,7 @@ func levelToJPrio(zLevel string) journal.Priority {
 
 func (w journalWriter) Write(p []byte) (n int, err error) {
 	if !journal.Enabled() {
-		err = fmt.Errorf("Cannot connect to journalD!!")
+		err = fmt.Errorf("cannot connect to journalD")
 		return
 	}
 	var event map[string]interface{}
diff --git a/log.go b/log.go
index da64b8a..025221f 100644
--- a/log.go
+++ b/log.go
@@ -303,9 +303,9 @@ func (l *Logger) Error() *Event {
 func (l *Logger) Err(err error) *Event {
 	if err != nil {
 		return l.Error().Err(err)
-	} else {
-		return l.Info()
 	}
+
+	return l.Info()
 }
 
 // Fatal starts a new message with fatal level. The os.Exit(1) function
diff --git a/log_test.go b/log_test.go
index e7dcd16..dfd2737 100644
--- a/log_test.go
+++ b/log_test.go
@@ -696,9 +696,9 @@ func TestCallerMarshalFunc(t *testing.T) {
 		parts := strings.Split(file, "/")
 		if len(parts) > 1 {
 			return strings.Join(parts[len(parts)-2:], "/") + ":" + strconv.Itoa(line)
-		} else {
-			return file + ":" + strconv.Itoa(line)
 		}
+
+		return file + ":" + strconv.Itoa(line)
 	}
 	_, file, line, _ = runtime.Caller(0)
 	caller = CallerMarshalFunc(file, line+2)