diff --git a/internal/generate.go b/internal/generate.go
index dde8a45..50819f9 100644
--- a/internal/generate.go
+++ b/internal/generate.go
@@ -56,9 +56,7 @@ func configureSubscriber(files chan *HashdeepEntry, writer *HashdeepOutputFile,
 		for {
 			fileEntry, more := <-files
 			if more {
-				err := writer.WriteEntry(fileEntry)
-
-				if err != nil {
+				if err := writer.WriteEntry(fileEntry); err != nil {
 					log.Warn(err)
 				}
 
diff --git a/internal/hashdeep.go b/internal/hashdeep.go
index ce0b8b3..e6cedca 100644
--- a/internal/hashdeep.go
+++ b/internal/hashdeep.go
@@ -85,18 +85,14 @@ func (h HashdeepOutputFile) WriteEntry(e *HashdeepEntry) error {
 }
 
 func (h *HashdeepOutputFile) Close() error {
-	err := h.writer.Flush()
-	if err != nil {
+	if err := h.writer.Flush(); err != nil {
 		return errors.Wrap(err, "Could not flush output writer")
 	}
 
-	err = h.file.Close()
-
-	if err != nil {
+	if err := h.file.Close(); err != nil {
 		return errors.Wrapf(err, "Could not close results file '%s'", h.OutputFile)
 	}
 
 	log.Info("Flushed and closed results file")
-
 	return nil
 }