diff --git a/CITATION.cff b/CITATION.cff
index 15e2591a..566a7ff1 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -63,6 +63,7 @@ keywords:
 - cran
 - ggplot2
 - gis
+- cran-r
 references:
 - type: software
   title: 'R: A Language and Environment for Statistical Computing'
diff --git a/DESCRIPTION b/DESCRIPTION
index 1b2d5895..74a43137 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -53,4 +53,4 @@ X-schema.org-applicationCategory: cartography
 X-schema.org-isPartOf: http://ropengov.org/
 X-schema.org-keywords: ropengov, r, spatial, api-wrapper, rstats,
     r-package, eurostat, gisco, thematic-maps, eurostat-data, cran,
-    ggplot2, gis
+    ggplot2, gis, cran-r
diff --git a/R/gisco_cache.R b/R/gisco_cache.R
index 38b1c413..da0eaaaa 100644
--- a/R/gisco_cache.R
+++ b/R/gisco_cache.R
@@ -184,7 +184,7 @@ gsc_helper_detect_cache_dir <- function() {
 
       # 3. Return from cached path
       Sys.setenv(GISCO_CACHE_DIR = cached_path)
-      return(cached_path)
+      cached_path
     } else {
       # 4. Default cache location
 
@@ -192,10 +192,10 @@ gsc_helper_detect_cache_dir <- function() {
         overwrite = TRUE,
         verbose = FALSE
       )
-      return(cache_dir)
+      cache_dir
     }
   } else {
-    return(getvar)
+    getvar
   }
   # nocov end
 }
diff --git a/R/gisco_check_access.R b/R/gisco_check_access.R
index 330071bb..2d1b7de3 100644
--- a/R/gisco_check_access.R
+++ b/R/gisco_check_access.R
@@ -23,14 +23,14 @@ gisco_check_access <- function() {
     tryCatch(
       download.file(url, destfile = tempfile(), quiet = TRUE),
       warning = function(e) {
-        return(FALSE)
+        FALSE
       }
     )
 
   if (isFALSE(access)) {
-    return(FALSE)
+    FALSE
   } else {
-    return(TRUE)
+    TRUE
   }
   # nocov end
 }
@@ -45,6 +45,6 @@ skip_if_gisco_offline <- function() {
   if (requireNamespace("testthat", quietly = TRUE)) {
     testthat::skip("GISCO API not reachable")
   }
-  return(invisible())
+  invisible()
   # nocov end
 }
diff --git a/R/gisco_get_units.R b/R/gisco_get_units.R
index d2bd1238..9cd27219 100644
--- a/R/gisco_get_units.R
+++ b/R/gisco_get_units.R
@@ -261,7 +261,7 @@ gsc_units_sf <- function(id_giscoR,
 
   # Last check
   df_sf <- sf::st_make_valid(df_sf)
-  return(df_sf)
+  df_sf
 }
 
 #' Download data frame for units
@@ -349,5 +349,5 @@ gsc_units_df <- function(id_giscoR, year, api_url, verbose) {
 
 
   gsc_message(verbose, "Database loaded succesfully")
-  return(df_csv)
+  df_csv
 }
diff --git a/R/utils_names.R b/R/utils_names.R
index 027919b4..3a39b66d 100644
--- a/R/utils_names.R
+++ b/R/utils_names.R
@@ -92,7 +92,7 @@ gsc_helper_utf8 <- function(data_sf) {
   colnames(data_sf) <- newnames
   data_sf <- sf::st_set_geometry(data_sf, nm)
 
-  return(data_sf)
+  data_sf
 }
 
 
@@ -105,7 +105,7 @@ gsc_message <- function(verbose, ...) {
 
   if (verbose) message(msg)
 
-  return(invisible())
+  invisible()
 }
 
 
diff --git a/README.md b/README.md
index d6417200..370957a6 100644
--- a/README.md
+++ b/README.md
@@ -186,7 +186,6 @@ We now download the data from Eurostat:
 library(eurostat)
 popdens <- get_eurostat("demo_r_d3dens") %>%
   filter(TIME_PERIOD == "2021-01-01")
-#> indexed 0B in  0s, 0B/sindexed 2.15GB in  0s, 2.15GB/s                                                                              
 ```
 
 By last, we merge and manipulate the data for creating the final plot:
diff --git a/codemeta.json b/codemeta.json
index 7a85593b..48ad004c 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -239,8 +239,8 @@
   },
   "applicationCategory": "cartography",
   "isPartOf": "http://ropengov.org/",
-  "keywords": ["ropengov", "r", "spatial", "api-wrapper", "rstats", "r-package", "eurostat", "gisco", "thematic-maps", "eurostat-data", "cran", "ggplot2", "gis"],
-  "fileSize": "1242.898KB",
+  "keywords": ["ropengov", "r", "spatial", "api-wrapper", "rstats", "r-package", "eurostat", "gisco", "thematic-maps", "eurostat-data", "cran", "ggplot2", "gis", "cran-r"],
+  "fileSize": "1241.968KB",
   "citation": [
     {
       "@type": "SoftwareSourceCode",