diff --git a/lib/Data/Database.php b/lib/Data/Database.php
index f5f9d1fe..27874962 100644
--- a/lib/Data/Database.php
+++ b/lib/Data/Database.php
@@ -55,7 +55,6 @@ class Database extends AbstractData
      * @access public
      * @param  array $options
      * @throws Exception
-     * @return
      */
     public function __construct(array $options)
     {
diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php
index a26979c6..22329e8a 100644
--- a/lib/Data/Filesystem.php
+++ b/lib/Data/Filesystem.php
@@ -66,7 +66,6 @@ class Filesystem extends AbstractData
      *
      * @access public
      * @param  array $options
-     * @return
      */
     public function __construct(array $options)
     {
diff --git a/lib/Data/GoogleCloudStorage.php b/lib/Data/GoogleCloudStorage.php
index e07e8182..b5cf485d 100644
--- a/lib/Data/GoogleCloudStorage.php
+++ b/lib/Data/GoogleCloudStorage.php
@@ -47,7 +47,6 @@ class GoogleCloudStorage extends AbstractData
      *
      * @access public
      * @param array $options
-     * @return
      */
     public function __construct(array $options)
     {
diff --git a/lib/Data/S3Storage.php b/lib/Data/S3Storage.php
index 3771019e..7a0fcc44 100644
--- a/lib/Data/S3Storage.php
+++ b/lib/Data/S3Storage.php
@@ -78,7 +78,6 @@ class S3Storage extends AbstractData
      *
      * @access public
      * @param array $options
-     * @return
      */
     public function __construct(array $options)
     {
diff --git a/lib/I18n.php b/lib/I18n.php
index d4345adb..7aa1ecd3 100644
--- a/lib/I18n.php
+++ b/lib/I18n.php
@@ -85,7 +85,7 @@ class I18n
      * @param  mixed $args one or multiple parameters injected into placeholders
      * @return string
      */
-    public static function _($messageId)
+    public static function _($messageId, ...$args)
     {
         return forward_static_call_array('PrivateBin\I18n::translate', func_get_args());
     }
@@ -99,7 +99,7 @@ class I18n
      * @param  mixed $args one or multiple parameters injected into placeholders
      * @return string
      */
-    public static function translate($messageId)
+    public static function translate($messageId, ...$args)
     {
         if (empty($messageId)) {
             return $messageId;
@@ -114,7 +114,7 @@ class I18n
         if (!array_key_exists($messageId, self::$_translations)) {
             self::$_translations[$messageId] = $messages;
         }
-        $args = func_get_args();
+        array_unshift($args, $messageId);
         if (is_array(self::$_translations[$messageId])) {
             $number = (int) $args[1];
             $key    = self::_getPluralForm($number);
@@ -130,11 +130,9 @@ class I18n
         }
         // encode any non-integer arguments and the message ID, if it doesn't contain a link
         $argsCount = count($args);
-        if ($argsCount > 1) {
-            for ($i = 0; $i < $argsCount; ++$i) {
-                if (($i > 0 && !is_int($args[$i])) || strpos($args[0], '<a') === false) {
-                    $args[$i] = self::encode($args[$i]);
-                }
+        for ($i = 0; $i < $argsCount; ++$i) {
+            if ($i > 0 ? !is_int($args[$i]) : strpos($args[0], '<a') === false) {
+                $args[$i] = self::encode($args[$i]);
             }
         }
         return call_user_func_array('sprintf', $args);