diff --git a/pom.xml b/pom.xml
index 4cf0680bd4..5dfbfa6380 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,11 +82,6 @@ The MIT License (MIT)
     </site>
   </distributionManagement>
   <dependencies>
-    <!--
-      @todo #720:30min When https://github.com/teamed/qulice/issues/877 is
-       fixed upgrade qulice dependency to the one that contains the fix
-       and fix any issues in the project that result from this upgrade.
-    -->
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
@@ -138,7 +133,7 @@ The MIT License (MIT)
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.17.1</version>
+            <version>0.17.3</version>
             <configuration>
               <excludes combine.children="append">
                 <exclude>checkstyle:/src/site/resources/.*</exclude>
diff --git a/src/main/java/org/cactoos/BiFunc.java b/src/main/java/org/cactoos/BiFunc.java
index 97b88e6a14..0896401548 100644
--- a/src/main/java/org/cactoos/BiFunc.java
+++ b/src/main/java/org/cactoos/BiFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @param <Z> Type of output
@@ -54,8 +52,6 @@ public interface BiFunc<X, Y, Z> {
     /**
      * BiFunc check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @param <X> Type of input
      * @param <Y> Type of input
      * @param <Z> Type of output
diff --git a/src/main/java/org/cactoos/BiProc.java b/src/main/java/org/cactoos/BiProc.java
index 6ec4dc8b86..89d419b320 100644
--- a/src/main/java/org/cactoos/BiProc.java
+++ b/src/main/java/org/cactoos/BiProc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @since 0.20
diff --git a/src/main/java/org/cactoos/Bytes.java b/src/main/java/org/cactoos/Bytes.java
index 66dffbec18..a7c67fd409 100644
--- a/src/main/java/org/cactoos/Bytes.java
+++ b/src/main/java/org/cactoos/Bytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @see org.cactoos.io.BytesOf
  * @since 0.1
  */
@@ -47,8 +45,6 @@ public interface Bytes {
     /**
      * Bytes check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @since 0.11
      */
     final class NoNulls implements Bytes {
diff --git a/src/main/java/org/cactoos/Func.java b/src/main/java/org/cactoos/Func.java
index 2f8e11716d..6c5a7f50bb 100644
--- a/src/main/java/org/cactoos/Func.java
+++ b/src/main/java/org/cactoos/Func.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @see org.cactoos.func.StickyFunc
@@ -61,8 +59,6 @@ public interface Func<X, Y> {
     /**
      * Func check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @param <X> Type of input
      * @param <Y> Type of output
      * @since 0.10
diff --git a/src/main/java/org/cactoos/Input.java b/src/main/java/org/cactoos/Input.java
index edeb804495..29e0a24b1b 100644
--- a/src/main/java/org/cactoos/Input.java
+++ b/src/main/java/org/cactoos/Input.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -43,9 +43,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @see org.cactoos.io.InputOf
  * @since 0.1
  */
@@ -61,8 +58,6 @@ public interface Input {
     /**
      * Input check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @since 0.10
      */
     final class NoNulls implements Input {
diff --git a/src/main/java/org/cactoos/Output.java b/src/main/java/org/cactoos/Output.java
index ff74a50228..eb5e82d09b 100644
--- a/src/main/java/org/cactoos/Output.java
+++ b/src/main/java/org/cactoos/Output.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -50,8 +50,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @see OutputTo
  * @since 0.1
  */
@@ -67,8 +65,6 @@ public interface Output {
     /**
      * Output check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @since 0.10
      */
     final class NoNulls implements Output {
diff --git a/src/main/java/org/cactoos/Proc.java b/src/main/java/org/cactoos/Proc.java
index 3be59501fd..92ac1f9483 100644
--- a/src/main/java/org/cactoos/Proc.java
+++ b/src/main/java/org/cactoos/Proc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @see org.cactoos.func.FuncOf
  * @since 0.1
@@ -51,8 +49,6 @@ public interface Proc<X> {
     /**
      * Proc check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @param <X> Type of input
      * @since 0.11
      */
diff --git a/src/main/java/org/cactoos/Scalar.java b/src/main/java/org/cactoos/Scalar.java
index e78d65cac2..ad6d2bf33c 100644
--- a/src/main/java/org/cactoos/Scalar.java
+++ b/src/main/java/org/cactoos/Scalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of result
  * @see StickyScalar
  * @see UncheckedScalar
@@ -61,8 +59,6 @@ public interface Scalar<T> {
     /**
      * Scalar check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @param <T> Type of result
      * @since 0.11
      */
diff --git a/src/main/java/org/cactoos/Text.java b/src/main/java/org/cactoos/Text.java
index 9564943438..e76298a7df 100644
--- a/src/main/java/org/cactoos/Text.java
+++ b/src/main/java/org/cactoos/Text.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @see org.cactoos.text.TextOf
  * @since 0.1
  */
@@ -53,8 +51,6 @@ public interface Text {
      *
      * <p>There is no thread-safety guarantee.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @since 0.11
      */
     final class NoNulls implements Text {
diff --git a/src/main/java/org/cactoos/bytes/Base64Bytes.java b/src/main/java/org/cactoos/bytes/Base64Bytes.java
index c6157594e0..59e60c64d0 100644
--- a/src/main/java/org/cactoos/bytes/Base64Bytes.java
+++ b/src/main/java/org/cactoos/bytes/Base64Bytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Decodes all origin bytes using the Base64 encoding scheme.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 public final class Base64Bytes implements Bytes {
diff --git a/src/main/java/org/cactoos/bytes/BytesBase64.java b/src/main/java/org/cactoos/bytes/BytesBase64.java
index bc6cd3b27f..ab6f11f0d4 100644
--- a/src/main/java/org/cactoos/bytes/BytesBase64.java
+++ b/src/main/java/org/cactoos/bytes/BytesBase64.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Encodes all origin bytes using the Base64 encoding scheme.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 public final class BytesBase64 implements Bytes {
diff --git a/src/main/java/org/cactoos/bytes/HexBytes.java b/src/main/java/org/cactoos/bytes/HexBytes.java
index c732bb319a..36b518e379 100644
--- a/src/main/java/org/cactoos/bytes/HexBytes.java
+++ b/src/main/java/org/cactoos/bytes/HexBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 /**
  * Decodes origin {@link Text} using the hexadecimal encoding scheme.
  *
- * @author Alexander Menshikov (sharplermc@gmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle MagicNumberCheck (500 lines)
  */
diff --git a/src/main/java/org/cactoos/bytes/package-info.java b/src/main/java/org/cactoos/bytes/package-info.java
index bd2fc5d4a6..6124aff611 100644
--- a/src/main/java/org/cactoos/bytes/package-info.java
+++ b/src/main/java/org/cactoos/bytes/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Bytes.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 package org.cactoos.bytes;
diff --git a/src/main/java/org/cactoos/collection/CollectionEnvelope.java b/src/main/java/org/cactoos/collection/CollectionEnvelope.java
index 4f7fe463a1..fc16a8285a 100644
--- a/src/main/java/org/cactoos/collection/CollectionEnvelope.java
+++ b/src/main/java/org/cactoos/collection/CollectionEnvelope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Element type
  * @since 0.23
  * @checkstyle AbstractClassNameCheck (500 lines)
diff --git a/src/main/java/org/cactoos/collection/CollectionNoNulls.java b/src/main/java/org/cactoos/collection/CollectionNoNulls.java
index 7ad68ec204..f68cea5509 100644
--- a/src/main/java/org/cactoos/collection/CollectionNoNulls.java
+++ b/src/main/java/org/cactoos/collection/CollectionNoNulls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Element type
  * @since 0.27
  */
diff --git a/src/main/java/org/cactoos/collection/CollectionOf.java b/src/main/java/org/cactoos/collection/CollectionOf.java
index 3fda4ee543..74d64167f0 100644
--- a/src/main/java/org/cactoos/collection/CollectionOf.java
+++ b/src/main/java/org/cactoos/collection/CollectionOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> List type
  * @see StickyCollection
  * @since 0.1
diff --git a/src/main/java/org/cactoos/collection/Filtered.java b/src/main/java/org/cactoos/collection/Filtered.java
index 9ab5d01e0c..afcaa2e8a7 100644
--- a/src/main/java/org/cactoos/collection/Filtered.java
+++ b/src/main/java/org/cactoos/collection/Filtered.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @since 1.16
  */
diff --git a/src/main/java/org/cactoos/collection/HeadOf.java b/src/main/java/org/cactoos/collection/HeadOf.java
index c39196ecbc..4605b1ea46 100644
--- a/src/main/java/org/cactoos/collection/HeadOf.java
+++ b/src/main/java/org/cactoos/collection/HeadOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Alexander Menshikov (sharplermc@gmail.com)
- * @version $Id$
  * @param <T> Type of source item
  * @since 0.29
  */
diff --git a/src/main/java/org/cactoos/collection/Joined.java b/src/main/java/org/cactoos/collection/Joined.java
index ac6024c047..c4dfd2d49a 100644
--- a/src/main/java/org/cactoos/collection/Joined.java
+++ b/src/main/java/org/cactoos/collection/Joined.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Mykola Yashchenko (vkont4@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @since 1.16
  */
diff --git a/src/main/java/org/cactoos/collection/Mapped.java b/src/main/java/org/cactoos/collection/Mapped.java
index b8f3761376..5e340d249d 100644
--- a/src/main/java/org/cactoos/collection/Mapped.java
+++ b/src/main/java/org/cactoos/collection/Mapped.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @param <Y> Type of target item
  * @since 0.14
diff --git a/src/main/java/org/cactoos/collection/Reversed.java b/src/main/java/org/cactoos/collection/Reversed.java
index 07e565a391..0d39f3614a 100644
--- a/src/main/java/org/cactoos/collection/Reversed.java
+++ b/src/main/java/org/cactoos/collection/Reversed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @since 1.16
  */
diff --git a/src/main/java/org/cactoos/collection/Shuffled.java b/src/main/java/org/cactoos/collection/Shuffled.java
index bbc867c134..27ff30d678 100644
--- a/src/main/java/org/cactoos/collection/Shuffled.java
+++ b/src/main/java/org/cactoos/collection/Shuffled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.23
  */
diff --git a/src/main/java/org/cactoos/collection/SolidCollection.java b/src/main/java/org/cactoos/collection/SolidCollection.java
index 93a6286c27..27542fecae 100644
--- a/src/main/java/org/cactoos/collection/SolidCollection.java
+++ b/src/main/java/org/cactoos/collection/SolidCollection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> List type
  * @see StickyCollection
  * @since 0.24
diff --git a/src/main/java/org/cactoos/collection/Sorted.java b/src/main/java/org/cactoos/collection/Sorted.java
index 7c95539a27..c66fbd5908 100644
--- a/src/main/java/org/cactoos/collection/Sorted.java
+++ b/src/main/java/org/cactoos/collection/Sorted.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.19
  */
diff --git a/src/main/java/org/cactoos/collection/StickyCollection.java b/src/main/java/org/cactoos/collection/StickyCollection.java
index f7ad8e4ee6..389f6f0558 100644
--- a/src/main/java/org/cactoos/collection/StickyCollection.java
+++ b/src/main/java/org/cactoos/collection/StickyCollection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Mykola Yashchenko (vkont4@gmail.com)
- * @version $Id$
  * @param <E> Type of item
  * @since 0.16
  */
diff --git a/src/main/java/org/cactoos/collection/SyncCollection.java b/src/main/java/org/cactoos/collection/SyncCollection.java
index f75f3f2009..61311a5b55 100644
--- a/src/main/java/org/cactoos/collection/SyncCollection.java
+++ b/src/main/java/org/cactoos/collection/SyncCollection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -42,8 +42,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> List type
  * @see StickyCollection
  * @since 0.24
diff --git a/src/main/java/org/cactoos/collection/TailOf.java b/src/main/java/org/cactoos/collection/TailOf.java
index ff48ae97c7..b2f723c69d 100644
--- a/src/main/java/org/cactoos/collection/TailOf.java
+++ b/src/main/java/org/cactoos/collection/TailOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/collection/package-info.java b/src/main/java/org/cactoos/collection/package-info.java
index 120890ace8..4469156b46 100644
--- a/src/main/java/org/cactoos/collection/package-info.java
+++ b/src/main/java/org/cactoos/collection/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Collections, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  */
 package org.cactoos.collection;
diff --git a/src/main/java/org/cactoos/func/AsyncFunc.java b/src/main/java/org/cactoos/func/AsyncFunc.java
index 6303b5f3cf..6666389e3e 100644
--- a/src/main/java/org/cactoos/func/AsyncFunc.java
+++ b/src/main/java/org/cactoos/func/AsyncFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -42,8 +42,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.10
diff --git a/src/main/java/org/cactoos/func/BiFuncOf.java b/src/main/java/org/cactoos/func/BiFuncOf.java
index d33edc630c..5ca8a7949a 100644
--- a/src/main/java/org/cactoos/func/BiFuncOf.java
+++ b/src/main/java/org/cactoos/func/BiFuncOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @param <Z> Type of output
diff --git a/src/main/java/org/cactoos/func/CallableOf.java b/src/main/java/org/cactoos/func/CallableOf.java
index e54c0c02d9..963dfa075c 100644
--- a/src/main/java/org/cactoos/func/CallableOf.java
+++ b/src/main/java/org/cactoos/func/CallableOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <T> Type of output
  * @since 0.12
diff --git a/src/main/java/org/cactoos/func/ChainedFunc.java b/src/main/java/org/cactoos/func/ChainedFunc.java
index e5e5cadde8..c57d25bfbc 100644
--- a/src/main/java/org/cactoos/func/ChainedFunc.java
+++ b/src/main/java/org/cactoos/func/ChainedFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Composed function.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @param <X> Type of input.
  * @param <Y> Intermediate type.
  * @param <Z> Type of output.
diff --git a/src/main/java/org/cactoos/func/FuncOf.java b/src/main/java/org/cactoos/func/FuncOf.java
index 139e56c542..6682772d11 100644
--- a/src/main/java/org/cactoos/func/FuncOf.java
+++ b/src/main/java/org/cactoos/func/FuncOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.12
diff --git a/src/main/java/org/cactoos/func/FuncWithFallback.java b/src/main/java/org/cactoos/func/FuncWithFallback.java
index 8cf1739e26..e174fe824f 100644
--- a/src/main/java/org/cactoos/func/FuncWithFallback.java
+++ b/src/main/java/org/cactoos/func/FuncWithFallback.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.2
diff --git a/src/main/java/org/cactoos/func/IoCheckedBiFunc.java b/src/main/java/org/cactoos/func/IoCheckedBiFunc.java
index 88688115cc..279000c0d0 100644
--- a/src/main/java/org/cactoos/func/IoCheckedBiFunc.java
+++ b/src/main/java/org/cactoos/func/IoCheckedBiFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  * {@link IOException} instead.
  *
  * <p>There is no thread-safety guarantee.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @param <Z> Type of output
diff --git a/src/main/java/org/cactoos/func/IoCheckedBiProc.java b/src/main/java/org/cactoos/func/IoCheckedBiProc.java
index c598b02376..f65ef33144 100644
--- a/src/main/java/org/cactoos/func/IoCheckedBiProc.java
+++ b/src/main/java/org/cactoos/func/IoCheckedBiProc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @since 0.22
diff --git a/src/main/java/org/cactoos/func/IoCheckedFunc.java b/src/main/java/org/cactoos/func/IoCheckedFunc.java
index 7e10a916a4..cb03f05c6c 100644
--- a/src/main/java/org/cactoos/func/IoCheckedFunc.java
+++ b/src/main/java/org/cactoos/func/IoCheckedFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.4
diff --git a/src/main/java/org/cactoos/func/IoCheckedProc.java b/src/main/java/org/cactoos/func/IoCheckedProc.java
index 7643ed8888..126cd0a258 100644
--- a/src/main/java/org/cactoos/func/IoCheckedProc.java
+++ b/src/main/java/org/cactoos/func/IoCheckedProc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @since 0.4
  */
diff --git a/src/main/java/org/cactoos/func/ProcOf.java b/src/main/java/org/cactoos/func/ProcOf.java
index 9b47378a84..72ad74f4be 100644
--- a/src/main/java/org/cactoos/func/ProcOf.java
+++ b/src/main/java/org/cactoos/func/ProcOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @since 0.12
  */
diff --git a/src/main/java/org/cactoos/func/RepeatedFunc.java b/src/main/java/org/cactoos/func/RepeatedFunc.java
index 1d1e6d1d18..259db408b7 100644
--- a/src/main/java/org/cactoos/func/RepeatedFunc.java
+++ b/src/main/java/org/cactoos/func/RepeatedFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  * Func that repeats its calculation a few times before
  * returning the last result.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.6
diff --git a/src/main/java/org/cactoos/func/RetryFunc.java b/src/main/java/org/cactoos/func/RetryFunc.java
index 146b2590fc..4221c0417b 100644
--- a/src/main/java/org/cactoos/func/RetryFunc.java
+++ b/src/main/java/org/cactoos/func/RetryFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.8
diff --git a/src/main/java/org/cactoos/func/RunnableOf.java b/src/main/java/org/cactoos/func/RunnableOf.java
index 47d0052527..a413ea860d 100644
--- a/src/main/java/org/cactoos/func/RunnableOf.java
+++ b/src/main/java/org/cactoos/func/RunnableOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @since 0.12
  */
diff --git a/src/main/java/org/cactoos/func/SolidBiFunc.java b/src/main/java/org/cactoos/func/SolidBiFunc.java
index 6fd56bc046..b6949395be 100644
--- a/src/main/java/org/cactoos/func/SolidBiFunc.java
+++ b/src/main/java/org/cactoos/func/SolidBiFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>Objects of this class are thread safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of first input
  * @param <Y> Type of second input
  * @param <Z> Type of output
diff --git a/src/main/java/org/cactoos/func/SolidFunc.java b/src/main/java/org/cactoos/func/SolidFunc.java
index 621a02eff5..022f7136ca 100644
--- a/src/main/java/org/cactoos/func/SolidFunc.java
+++ b/src/main/java/org/cactoos/func/SolidFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>Objects of this class are thread safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.24
diff --git a/src/main/java/org/cactoos/func/StickyBiFunc.java b/src/main/java/org/cactoos/func/StickyBiFunc.java
index c6bd72fa30..131fc9441f 100644
--- a/src/main/java/org/cactoos/func/StickyBiFunc.java
+++ b/src/main/java/org/cactoos/func/StickyBiFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  * cache.</p>
  *
  * <p>There is no thread-safety guarantee.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @param <Z> Type of output
diff --git a/src/main/java/org/cactoos/func/StickyFunc.java b/src/main/java/org/cactoos/func/StickyFunc.java
index 59836e2472..f6099d91cf 100644
--- a/src/main/java/org/cactoos/func/StickyFunc.java
+++ b/src/main/java/org/cactoos/func/StickyFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @see StickyScalar
diff --git a/src/main/java/org/cactoos/func/SyncBiFunc.java b/src/main/java/org/cactoos/func/SyncBiFunc.java
index 1b6a2f128e..6543db773f 100644
--- a/src/main/java/org/cactoos/func/SyncBiFunc.java
+++ b/src/main/java/org/cactoos/func/SyncBiFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>Objects of this class are thread safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of first input
  * @param <Y> Type of second input
  * @param <Z> Type of output
diff --git a/src/main/java/org/cactoos/func/SyncFunc.java b/src/main/java/org/cactoos/func/SyncFunc.java
index 482a455f06..9f3178959c 100644
--- a/src/main/java/org/cactoos/func/SyncFunc.java
+++ b/src/main/java/org/cactoos/func/SyncFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>Objects of this class are thread safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.4
diff --git a/src/main/java/org/cactoos/func/TimedFunc.java b/src/main/java/org/cactoos/func/TimedFunc.java
index 42f330d379..121878c992 100644
--- a/src/main/java/org/cactoos/func/TimedFunc.java
+++ b/src/main/java/org/cactoos/func/TimedFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Function that gets interrupted after a certain time has passed.
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.29.3
diff --git a/src/main/java/org/cactoos/func/UncheckedBiFunc.java b/src/main/java/org/cactoos/func/UncheckedBiFunc.java
index d5329066e4..3c5a0ad3c8 100644
--- a/src/main/java/org/cactoos/func/UncheckedBiFunc.java
+++ b/src/main/java/org/cactoos/func/UncheckedBiFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @param <Z> Type of output
diff --git a/src/main/java/org/cactoos/func/UncheckedBiProc.java b/src/main/java/org/cactoos/func/UncheckedBiProc.java
index eea77cea6a..74b3963736 100644
--- a/src/main/java/org/cactoos/func/UncheckedBiProc.java
+++ b/src/main/java/org/cactoos/func/UncheckedBiProc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @since 0.22
diff --git a/src/main/java/org/cactoos/func/UncheckedFunc.java b/src/main/java/org/cactoos/func/UncheckedFunc.java
index 8b4e80a4e7..caa91256b6 100644
--- a/src/main/java/org/cactoos/func/UncheckedFunc.java
+++ b/src/main/java/org/cactoos/func/UncheckedFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.2
diff --git a/src/main/java/org/cactoos/func/UncheckedProc.java b/src/main/java/org/cactoos/func/UncheckedProc.java
index a5e3d80a3b..0b03fa8e28 100644
--- a/src/main/java/org/cactoos/func/UncheckedProc.java
+++ b/src/main/java/org/cactoos/func/UncheckedProc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @since 0.2
  */
diff --git a/src/main/java/org/cactoos/func/package-info.java b/src/main/java/org/cactoos/func/package-info.java
index 05755195eb..c549e121dd 100644
--- a/src/main/java/org/cactoos/func/package-info.java
+++ b/src/main/java/org/cactoos/func/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Functions and procedures.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 package org.cactoos.func;
diff --git a/src/main/java/org/cactoos/io/BytesOf.java b/src/main/java/org/cactoos/io/BytesOf.java
index ebc95d4b06..412344241a 100644
--- a/src/main/java/org/cactoos/io/BytesOf.java
+++ b/src/main/java/org/cactoos/io/BytesOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,10 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Ix (ixmanuel@yahoo.com)
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 public final class BytesOf implements Bytes {
diff --git a/src/main/java/org/cactoos/io/CheckedBytes.java b/src/main/java/org/cactoos/io/CheckedBytes.java
index 41fbba84ec..09cd266e74 100644
--- a/src/main/java/org/cactoos/io/CheckedBytes.java
+++ b/src/main/java/org/cactoos/io/CheckedBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Bytes that throws exception of specified type.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @param <E> Exception's type.
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/io/CheckedInput.java b/src/main/java/org/cactoos/io/CheckedInput.java
index 6b7bd1d0a3..37e6762606 100644
--- a/src/main/java/org/cactoos/io/CheckedInput.java
+++ b/src/main/java/org/cactoos/io/CheckedInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Input that throws exception of specified type.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @param <E> Exception's type.
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/io/CheckedOutput.java b/src/main/java/org/cactoos/io/CheckedOutput.java
index bdefb97f1a..826035e41f 100644
--- a/src/main/java/org/cactoos/io/CheckedOutput.java
+++ b/src/main/java/org/cactoos/io/CheckedOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Output that throws exception of specified type.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @param <E> Exception's type.
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/io/DeadInput.java b/src/main/java/org/cactoos/io/DeadInput.java
index 587b939e5b..7913b95c80 100644
--- a/src/main/java/org/cactoos/io/DeadInput.java
+++ b/src/main/java/org/cactoos/io/DeadInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class DeadInput implements Input {
diff --git a/src/main/java/org/cactoos/io/DeadInputStream.java b/src/main/java/org/cactoos/io/DeadInputStream.java
index 1c8a6b1002..2998f986f5 100644
--- a/src/main/java/org/cactoos/io/DeadInputStream.java
+++ b/src/main/java/org/cactoos/io/DeadInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.16
  */
 public final class DeadInputStream extends InputStream {
diff --git a/src/main/java/org/cactoos/io/DeadOutput.java b/src/main/java/org/cactoos/io/DeadOutput.java
index 604255014b..c64f59bd22 100644
--- a/src/main/java/org/cactoos/io/DeadOutput.java
+++ b/src/main/java/org/cactoos/io/DeadOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class DeadOutput implements Output {
diff --git a/src/main/java/org/cactoos/io/DeadOutputStream.java b/src/main/java/org/cactoos/io/DeadOutputStream.java
index 3d96dd01ec..f0eca84b0c 100644
--- a/src/main/java/org/cactoos/io/DeadOutputStream.java
+++ b/src/main/java/org/cactoos/io/DeadOutputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class DeadOutputStream extends OutputStream {
diff --git a/src/main/java/org/cactoos/io/DigestEnvelope.java b/src/main/java/org/cactoos/io/DigestEnvelope.java
index 44ddc6d32d..a7c529423d 100644
--- a/src/main/java/org/cactoos/io/DigestEnvelope.java
+++ b/src/main/java/org/cactoos/io/DigestEnvelope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle AbstractClassNameCheck (500 lines)
  * @checkstyle DesignForExtensionCheck (500 lines)
diff --git a/src/main/java/org/cactoos/io/Directory.java b/src/main/java/org/cactoos/io/Directory.java
index e2e8480647..71d87f40d8 100644
--- a/src/main/java/org/cactoos/io/Directory.java
+++ b/src/main/java/org/cactoos/io/Directory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.21
  */
 public final class Directory implements Iterable<Path> {
diff --git a/src/main/java/org/cactoos/io/EmptyBytes.java b/src/main/java/org/cactoos/io/EmptyBytes.java
index 990eb91d12..ad5333199c 100644
--- a/src/main/java/org/cactoos/io/EmptyBytes.java
+++ b/src/main/java/org/cactoos/io/EmptyBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.2
  */
 public final class EmptyBytes implements Bytes {
diff --git a/src/main/java/org/cactoos/io/GzipInput.java b/src/main/java/org/cactoos/io/GzipInput.java
index 53675adfc0..c0c53974da 100644
--- a/src/main/java/org/cactoos/io/GzipInput.java
+++ b/src/main/java/org/cactoos/io/GzipInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Input that reads compressed data from the GZIP file format.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 public final class GzipInput implements Input {
diff --git a/src/main/java/org/cactoos/io/GzipOutput.java b/src/main/java/org/cactoos/io/GzipOutput.java
index 4899256426..32f0fd5b52 100644
--- a/src/main/java/org/cactoos/io/GzipOutput.java
+++ b/src/main/java/org/cactoos/io/GzipOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Output that writes compressed data in the GZIP file format.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 public final class GzipOutput implements Output {
diff --git a/src/main/java/org/cactoos/io/HeadInput.java b/src/main/java/org/cactoos/io/HeadInput.java
index 220f07f0b4..1404de3427 100644
--- a/src/main/java/org/cactoos/io/HeadInput.java
+++ b/src/main/java/org/cactoos/io/HeadInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Input that only shows the first N bytes of the original input.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  */
 public final class HeadInput implements Input {
diff --git a/src/main/java/org/cactoos/io/HeadInputStream.java b/src/main/java/org/cactoos/io/HeadInputStream.java
index 2278de7b6a..80fe7e932e 100644
--- a/src/main/java/org/cactoos/io/HeadInputStream.java
+++ b/src/main/java/org/cactoos/io/HeadInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  */
 public final class HeadInputStream extends InputStream {
diff --git a/src/main/java/org/cactoos/io/InputAsBytes.java b/src/main/java/org/cactoos/io/InputAsBytes.java
index 79a23e8646..5541fca54d 100644
--- a/src/main/java/org/cactoos/io/InputAsBytes.java
+++ b/src/main/java/org/cactoos/io/InputAsBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 final class InputAsBytes implements Bytes {
diff --git a/src/main/java/org/cactoos/io/InputOf.java b/src/main/java/org/cactoos/io/InputOf.java
index 45c7a2bc72..66668c3b6e 100644
--- a/src/main/java/org/cactoos/io/InputOf.java
+++ b/src/main/java/org/cactoos/io/InputOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -45,10 +45,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Ix (ixmanuel@yahoo.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11.8
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
diff --git a/src/main/java/org/cactoos/io/InputStreamOf.java b/src/main/java/org/cactoos/io/InputStreamOf.java
index b148fa649d..1ff61fb479 100644
--- a/src/main/java/org/cactoos/io/InputStreamOf.java
+++ b/src/main/java/org/cactoos/io/InputStreamOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -44,8 +44,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  */
 public final class InputStreamOf extends InputStream {
diff --git a/src/main/java/org/cactoos/io/InputWithFallback.java b/src/main/java/org/cactoos/io/InputWithFallback.java
index 2b10a1ef78..72490760bd 100644
--- a/src/main/java/org/cactoos/io/InputWithFallback.java
+++ b/src/main/java/org/cactoos/io/InputWithFallback.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 public final class InputWithFallback implements Input {
diff --git a/src/main/java/org/cactoos/io/LSInputOf.java b/src/main/java/org/cactoos/io/LSInputOf.java
index 22bbf73c59..6832318569 100644
--- a/src/main/java/org/cactoos/io/LSInputOf.java
+++ b/src/main/java/org/cactoos/io/LSInputOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.6
  * @checkstyle AbbreviationAsWordInNameCheck (10 lines)
  */
diff --git a/src/main/java/org/cactoos/io/LengthOf.java b/src/main/java/org/cactoos/io/LengthOf.java
index 07bc43d56c..8696ef6c92 100644
--- a/src/main/java/org/cactoos/io/LengthOf.java
+++ b/src/main/java/org/cactoos/io/LengthOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class LengthOf extends NumberEnvelope {
diff --git a/src/main/java/org/cactoos/io/LoggingInput.java b/src/main/java/org/cactoos/io/LoggingInput.java
index 24d0e32777..0578de7d96 100644
--- a/src/main/java/org/cactoos/io/LoggingInput.java
+++ b/src/main/java/org/cactoos/io/LoggingInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings("PMD.LoggerIsNotStaticFinal")
diff --git a/src/main/java/org/cactoos/io/LoggingInputStream.java b/src/main/java/org/cactoos/io/LoggingInputStream.java
index 759203b162..8ab71b65d4 100644
--- a/src/main/java/org/cactoos/io/LoggingInputStream.java
+++ b/src/main/java/org/cactoos/io/LoggingInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings({"PMD.LoggerIsNotStaticFinal", "PMD.MoreThanOneLogger"})
diff --git a/src/main/java/org/cactoos/io/LoggingOutput.java b/src/main/java/org/cactoos/io/LoggingOutput.java
index 592daa715f..14c19badc3 100644
--- a/src/main/java/org/cactoos/io/LoggingOutput.java
+++ b/src/main/java/org/cactoos/io/LoggingOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings("PMD.LoggerIsNotStaticFinal")
diff --git a/src/main/java/org/cactoos/io/LoggingOutputStream.java b/src/main/java/org/cactoos/io/LoggingOutputStream.java
index ba6170fece..05ce9e9b0d 100644
--- a/src/main/java/org/cactoos/io/LoggingOutputStream.java
+++ b/src/main/java/org/cactoos/io/LoggingOutputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings(
diff --git a/src/main/java/org/cactoos/io/Md5DigestOf.java b/src/main/java/org/cactoos/io/Md5DigestOf.java
index 3eecc121ce..0a1e30f86e 100644
--- a/src/main/java/org/cactoos/io/Md5DigestOf.java
+++ b/src/main/java/org/cactoos/io/Md5DigestOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
diff --git a/src/main/java/org/cactoos/io/OutputStreamTo.java b/src/main/java/org/cactoos/io/OutputStreamTo.java
index 7648eedfdc..ffdbcfbaeb 100644
--- a/src/main/java/org/cactoos/io/OutputStreamTo.java
+++ b/src/main/java/org/cactoos/io/OutputStreamTo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  */
 public final class OutputStreamTo extends OutputStream {
diff --git a/src/main/java/org/cactoos/io/OutputTo.java b/src/main/java/org/cactoos/io/OutputTo.java
index d07a9c961f..610dc890f1 100644
--- a/src/main/java/org/cactoos/io/OutputTo.java
+++ b/src/main/java/org/cactoos/io/OutputTo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,9 +38,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Ix (ixmanuel@yahoo.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 public final class OutputTo implements Output {
diff --git a/src/main/java/org/cactoos/io/ReaderAsBytes.java b/src/main/java/org/cactoos/io/ReaderAsBytes.java
index 657717ca65..03eaacfa14 100644
--- a/src/main/java/org/cactoos/io/ReaderAsBytes.java
+++ b/src/main/java/org/cactoos/io/ReaderAsBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,9 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @since 0.12
  */
 final class ReaderAsBytes implements Bytes {
diff --git a/src/main/java/org/cactoos/io/ReaderOf.java b/src/main/java/org/cactoos/io/ReaderOf.java
index 2a3fd9390d..4d0a0ce9fd 100644
--- a/src/main/java/org/cactoos/io/ReaderOf.java
+++ b/src/main/java/org/cactoos/io/ReaderOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -47,8 +47,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  */
 public final class ReaderOf extends Reader {
diff --git a/src/main/java/org/cactoos/io/ResourceOf.java b/src/main/java/org/cactoos/io/ResourceOf.java
index 58bd755576..0facd84ed3 100644
--- a/src/main/java/org/cactoos/io/ResourceOf.java
+++ b/src/main/java/org/cactoos/io/ResourceOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  * if you want to load a text file from {@code /com/example/Test.txt},
  * you must provide this name: {@code "com/example/Test.txt"}.</p>
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @see ClassLoader#getResource(String)
  * @since 0.1
  */
diff --git a/src/main/java/org/cactoos/io/Sha1DigestOf.java b/src/main/java/org/cactoos/io/Sha1DigestOf.java
index 37714681cb..67db04256f 100644
--- a/src/main/java/org/cactoos/io/Sha1DigestOf.java
+++ b/src/main/java/org/cactoos/io/Sha1DigestOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
diff --git a/src/main/java/org/cactoos/io/Sha256DigestOf.java b/src/main/java/org/cactoos/io/Sha256DigestOf.java
index 543560f38f..7923e95eb4 100644
--- a/src/main/java/org/cactoos/io/Sha256DigestOf.java
+++ b/src/main/java/org/cactoos/io/Sha256DigestOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
diff --git a/src/main/java/org/cactoos/io/StderrOutput.java b/src/main/java/org/cactoos/io/StderrOutput.java
index 67ad68b438..a9fd19c794 100644
--- a/src/main/java/org/cactoos/io/StderrOutput.java
+++ b/src/main/java/org/cactoos/io/StderrOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.6
  */
 public final class StderrOutput implements Output {
diff --git a/src/main/java/org/cactoos/io/StdinInput.java b/src/main/java/org/cactoos/io/StdinInput.java
index 33cbc13c87..b06f9ccdda 100644
--- a/src/main/java/org/cactoos/io/StdinInput.java
+++ b/src/main/java/org/cactoos/io/StdinInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.6
  */
 public final class StdinInput implements Input {
diff --git a/src/main/java/org/cactoos/io/StdoutOutput.java b/src/main/java/org/cactoos/io/StdoutOutput.java
index ee5cc10f29..14a59206bf 100644
--- a/src/main/java/org/cactoos/io/StdoutOutput.java
+++ b/src/main/java/org/cactoos/io/StdoutOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.6
  */
 public final class StdoutOutput implements Output {
diff --git a/src/main/java/org/cactoos/io/StickyInput.java b/src/main/java/org/cactoos/io/StickyInput.java
index 940cabcb15..f34d676758 100644
--- a/src/main/java/org/cactoos/io/StickyInput.java
+++ b/src/main/java/org/cactoos/io/StickyInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.6
  */
 public final class StickyInput implements Input {
diff --git a/src/main/java/org/cactoos/io/SyncInput.java b/src/main/java/org/cactoos/io/SyncInput.java
index c626edc959..d36240689f 100644
--- a/src/main/java/org/cactoos/io/SyncInput.java
+++ b/src/main/java/org/cactoos/io/SyncInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>Objects of this class are thread safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.18
  */
 public final class SyncInput implements Input {
diff --git a/src/main/java/org/cactoos/io/SyncOutput.java b/src/main/java/org/cactoos/io/SyncOutput.java
index 460807ff04..185cd83d4b 100644
--- a/src/main/java/org/cactoos/io/SyncOutput.java
+++ b/src/main/java/org/cactoos/io/SyncOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>Objects of this class are thread safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.18
  */
 public final class SyncOutput implements Output {
diff --git a/src/main/java/org/cactoos/io/TailInput.java b/src/main/java/org/cactoos/io/TailInput.java
index 6ed55ed216..a426845d0a 100644
--- a/src/main/java/org/cactoos/io/TailInput.java
+++ b/src/main/java/org/cactoos/io/TailInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.30
  */
 public final class TailInput implements Input {
diff --git a/src/main/java/org/cactoos/io/TeeInput.java b/src/main/java/org/cactoos/io/TeeInput.java
index 943cb2f1a6..8a140126eb 100644
--- a/src/main/java/org/cactoos/io/TeeInput.java
+++ b/src/main/java/org/cactoos/io/TeeInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -42,8 +42,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class TeeInput implements Input {
diff --git a/src/main/java/org/cactoos/io/TeeInputStream.java b/src/main/java/org/cactoos/io/TeeInputStream.java
index 19861a1b0f..ca55a45db4 100644
--- a/src/main/java/org/cactoos/io/TeeInputStream.java
+++ b/src/main/java/org/cactoos/io/TeeInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class TeeInputStream extends InputStream {
diff --git a/src/main/java/org/cactoos/io/TeeOutput.java b/src/main/java/org/cactoos/io/TeeOutput.java
index 6bca3c41db..48b5b87b5e 100644
--- a/src/main/java/org/cactoos/io/TeeOutput.java
+++ b/src/main/java/org/cactoos/io/TeeOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.16
  */
 public final class TeeOutput implements Output {
diff --git a/src/main/java/org/cactoos/io/TeeOutputStream.java b/src/main/java/org/cactoos/io/TeeOutputStream.java
index 6eac0f5e8f..652141dc07 100644
--- a/src/main/java/org/cactoos/io/TeeOutputStream.java
+++ b/src/main/java/org/cactoos/io/TeeOutputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.16
  */
 public final class TeeOutputStream extends OutputStream {
diff --git a/src/main/java/org/cactoos/io/TeeReader.java b/src/main/java/org/cactoos/io/TeeReader.java
index 582d55d3f3..795936ab9f 100644
--- a/src/main/java/org/cactoos/io/TeeReader.java
+++ b/src/main/java/org/cactoos/io/TeeReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  * Input to Output copying reader.
  *
  * <p>There is no thread-safety guarantee.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.13
  */
 public final class TeeReader extends Reader {
diff --git a/src/main/java/org/cactoos/io/TempFile.java b/src/main/java/org/cactoos/io/TempFile.java
index 8ced2c675c..aaab3641dc 100644
--- a/src/main/java/org/cactoos/io/TempFile.java
+++ b/src/main/java/org/cactoos/io/TempFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -47,8 +47,6 @@
  * The physical file is deleted from the filesystem when the temp file is
  * closed.
  *
- * @author George Aristy (george.aristy@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 public final class TempFile implements Scalar<Path>, Closeable {
diff --git a/src/main/java/org/cactoos/io/UncheckedBytes.java b/src/main/java/org/cactoos/io/UncheckedBytes.java
index 8e80e0ef3a..d7f2644ce2 100644
--- a/src/main/java/org/cactoos/io/UncheckedBytes.java
+++ b/src/main/java/org/cactoos/io/UncheckedBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.3
  */
 public final class UncheckedBytes implements Bytes {
diff --git a/src/main/java/org/cactoos/io/UncheckedInput.java b/src/main/java/org/cactoos/io/UncheckedInput.java
index b82d7c2cc1..46c5a8072b 100644
--- a/src/main/java/org/cactoos/io/UncheckedInput.java
+++ b/src/main/java/org/cactoos/io/UncheckedInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 public final class UncheckedInput implements Input {
diff --git a/src/main/java/org/cactoos/io/UncheckedOutput.java b/src/main/java/org/cactoos/io/UncheckedOutput.java
index e530557be4..e9761c831e 100644
--- a/src/main/java/org/cactoos/io/UncheckedOutput.java
+++ b/src/main/java/org/cactoos/io/UncheckedOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 public final class UncheckedOutput implements Output {
diff --git a/src/main/java/org/cactoos/io/WriterAsOutput.java b/src/main/java/org/cactoos/io/WriterAsOutput.java
index 30cb408b07..9bcf5e6171 100644
--- a/src/main/java/org/cactoos/io/WriterAsOutput.java
+++ b/src/main/java/org/cactoos/io/WriterAsOutput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,8 +37,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  */
 final class WriterAsOutput implements Output {
diff --git a/src/main/java/org/cactoos/io/WriterAsOutputStream.java b/src/main/java/org/cactoos/io/WriterAsOutputStream.java
index 41fd0264ee..5b2645f884 100644
--- a/src/main/java/org/cactoos/io/WriterAsOutputStream.java
+++ b/src/main/java/org/cactoos/io/WriterAsOutputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -42,8 +42,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  */
 final class WriterAsOutputStream extends OutputStream {
diff --git a/src/main/java/org/cactoos/io/WriterTo.java b/src/main/java/org/cactoos/io/WriterTo.java
index 8d4f9a9560..6ba708694d 100644
--- a/src/main/java/org/cactoos/io/WriterTo.java
+++ b/src/main/java/org/cactoos/io/WriterTo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -42,8 +42,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  */
 public final class WriterTo extends Writer {
diff --git a/src/main/java/org/cactoos/io/Zip.java b/src/main/java/org/cactoos/io/Zip.java
index 3de49b88f9..520f204450 100644
--- a/src/main/java/org/cactoos/io/Zip.java
+++ b/src/main/java/org/cactoos/io/Zip.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  * <p>
  * <p>There is no thread-safety guarantee.
  *
- * @author Alexander Menshikov (sharplermc@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
diff --git a/src/main/java/org/cactoos/io/package-info.java b/src/main/java/org/cactoos/io/package-info.java
index 5bfe3cb64a..9aa77480ec 100644
--- a/src/main/java/org/cactoos/io/package-info.java
+++ b/src/main/java/org/cactoos/io/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Input/Output.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 package org.cactoos.io;
diff --git a/src/main/java/org/cactoos/iterable/Cycled.java b/src/main/java/org/cactoos/iterable/Cycled.java
index 997847aaf0..58eac0bb63 100644
--- a/src/main/java/org/cactoos/iterable/Cycled.java
+++ b/src/main/java/org/cactoos/iterable/Cycled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @param <T> Type of item
  * @since 0.8
  */
diff --git a/src/main/java/org/cactoos/iterable/Endless.java b/src/main/java/org/cactoos/iterable/Endless.java
index 8a8d497e23..53d19f92d9 100644
--- a/src/main/java/org/cactoos/iterable/Endless.java
+++ b/src/main/java/org/cactoos/iterable/Endless.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
  * <p>If you need to repeat certain amount of time,
  * use {@link Repeated}.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.4
  */
diff --git a/src/main/java/org/cactoos/iterable/Filtered.java b/src/main/java/org/cactoos/iterable/Filtered.java
index a98cc8e1f8..2aade7bf01 100644
--- a/src/main/java/org/cactoos/iterable/Filtered.java
+++ b/src/main/java/org/cactoos/iterable/Filtered.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -43,8 +43,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @see Filtered
  * @since 0.1
diff --git a/src/main/java/org/cactoos/iterable/HeadOf.java b/src/main/java/org/cactoos/iterable/HeadOf.java
index 7aaf84b21b..f2eae1e839 100644
--- a/src/main/java/org/cactoos/iterable/HeadOf.java
+++ b/src/main/java/org/cactoos/iterable/HeadOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.8
  */
diff --git a/src/main/java/org/cactoos/iterable/IterableEnvelope.java b/src/main/java/org/cactoos/iterable/IterableEnvelope.java
index 457a6af9ac..d6e29538c5 100644
--- a/src/main/java/org/cactoos/iterable/IterableEnvelope.java
+++ b/src/main/java/org/cactoos/iterable/IterableEnvelope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.24
  * @checkstyle AbstractClassNameCheck (500 lines)
diff --git a/src/main/java/org/cactoos/iterable/IterableNoNulls.java b/src/main/java/org/cactoos/iterable/IterableNoNulls.java
index fe5ea5d5b4..98a16b6b66 100644
--- a/src/main/java/org/cactoos/iterable/IterableNoNulls.java
+++ b/src/main/java/org/cactoos/iterable/IterableNoNulls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.27
  */
diff --git a/src/main/java/org/cactoos/iterable/IterableOf.java b/src/main/java/org/cactoos/iterable/IterableOf.java
index 99a76bc94e..886ad3d0c0 100644
--- a/src/main/java/org/cactoos/iterable/IterableOf.java
+++ b/src/main/java/org/cactoos/iterable/IterableOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.12
  */
diff --git a/src/main/java/org/cactoos/iterable/IterableOfBooleans.java b/src/main/java/org/cactoos/iterable/IterableOfBooleans.java
index 998c326bc2..a69c9f0b12 100644
--- a/src/main/java/org/cactoos/iterable/IterableOfBooleans.java
+++ b/src/main/java/org/cactoos/iterable/IterableOfBooleans.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
 /**
  * Iterable of boolean values.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 public final class IterableOfBooleans extends IterableEnvelope<Boolean> {
diff --git a/src/main/java/org/cactoos/iterable/IterableOfBytes.java b/src/main/java/org/cactoos/iterable/IterableOfBytes.java
index e895087e4c..9cc45db1a6 100644
--- a/src/main/java/org/cactoos/iterable/IterableOfBytes.java
+++ b/src/main/java/org/cactoos/iterable/IterableOfBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Iterable of bytes.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @todo #803:30min Introduce IteratorOfBytes and IteratorOfDoubles which will
  *  take array of their related primitive types (byte, double) and produce
diff --git a/src/main/java/org/cactoos/iterable/IterableOfChars.java b/src/main/java/org/cactoos/iterable/IterableOfChars.java
index 9f0096474a..b4d9876477 100644
--- a/src/main/java/org/cactoos/iterable/IterableOfChars.java
+++ b/src/main/java/org/cactoos/iterable/IterableOfChars.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
 /**
  * Iterable of characters.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 public final class IterableOfChars extends IterableEnvelope<Character> {
diff --git a/src/main/java/org/cactoos/iterable/IterableOfDoubles.java b/src/main/java/org/cactoos/iterable/IterableOfDoubles.java
index 01f3588ef4..14f77ff082 100644
--- a/src/main/java/org/cactoos/iterable/IterableOfDoubles.java
+++ b/src/main/java/org/cactoos/iterable/IterableOfDoubles.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Iterable of double values.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 public final class IterableOfDoubles extends IterableEnvelope<Double> {
diff --git a/src/main/java/org/cactoos/iterable/IterableOfFloats.java b/src/main/java/org/cactoos/iterable/IterableOfFloats.java
index 77444e3273..269ebf994f 100644
--- a/src/main/java/org/cactoos/iterable/IterableOfFloats.java
+++ b/src/main/java/org/cactoos/iterable/IterableOfFloats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Iterable of float values.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 public final class IterableOfFloats extends IterableEnvelope<Float> {
diff --git a/src/main/java/org/cactoos/iterable/IterableOfInts.java b/src/main/java/org/cactoos/iterable/IterableOfInts.java
index 40d7b6c717..9cdd8b0841 100644
--- a/src/main/java/org/cactoos/iterable/IterableOfInts.java
+++ b/src/main/java/org/cactoos/iterable/IterableOfInts.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Iterable of integer values.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 public final class IterableOfInts extends IterableEnvelope<Integer> {
diff --git a/src/main/java/org/cactoos/iterable/IterableOfLongs.java b/src/main/java/org/cactoos/iterable/IterableOfLongs.java
index c11306609c..aeebaf06e8 100644
--- a/src/main/java/org/cactoos/iterable/IterableOfLongs.java
+++ b/src/main/java/org/cactoos/iterable/IterableOfLongs.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Iterable of long values.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @todo #802:30min Introduce IteratorOfLongs and IteratorOfShorts which will
  *  take array of their related primitive types (long, short) and
diff --git a/src/main/java/org/cactoos/iterable/IterableOfShorts.java b/src/main/java/org/cactoos/iterable/IterableOfShorts.java
index cefbdf7808..f7fa3a9bdd 100644
--- a/src/main/java/org/cactoos/iterable/IterableOfShorts.java
+++ b/src/main/java/org/cactoos/iterable/IterableOfShorts.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Iterable of short values.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 public final class IterableOfShorts extends IterableEnvelope<Short> {
diff --git a/src/main/java/org/cactoos/iterable/Joined.java b/src/main/java/org/cactoos/iterable/Joined.java
index cac8bcd65a..e94668b521 100644
--- a/src/main/java/org/cactoos/iterable/Joined.java
+++ b/src/main/java/org/cactoos/iterable/Joined.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of item
  * @since 0.1
  */
diff --git a/src/main/java/org/cactoos/iterable/LengthOf.java b/src/main/java/org/cactoos/iterable/LengthOf.java
index ba38374a2c..a2ed3d1ce2 100644
--- a/src/main/java/org/cactoos/iterable/LengthOf.java
+++ b/src/main/java/org/cactoos/iterable/LengthOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class LengthOf extends NumberEnvelope {
diff --git a/src/main/java/org/cactoos/iterable/Mapped.java b/src/main/java/org/cactoos/iterable/Mapped.java
index bd50a0ece5..0a2e43b0dc 100644
--- a/src/main/java/org/cactoos/iterable/Mapped.java
+++ b/src/main/java/org/cactoos/iterable/Mapped.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @param <Y> Type of target item
  * @since 0.1
diff --git a/src/main/java/org/cactoos/iterable/Partitioned.java b/src/main/java/org/cactoos/iterable/Partitioned.java
index ee138a651e..3b1323a2ee 100644
--- a/src/main/java/org/cactoos/iterable/Partitioned.java
+++ b/src/main/java/org/cactoos/iterable/Partitioned.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
 /**
  * Iterable implementation for partitioning functionality.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @param <T> Partitions value type
  * @since 0.29
  */
diff --git a/src/main/java/org/cactoos/iterable/RangeOf.java b/src/main/java/org/cactoos/iterable/RangeOf.java
index 6b85abea4c..b31a889a8c 100644
--- a/src/main/java/org/cactoos/iterable/RangeOf.java
+++ b/src/main/java/org/cactoos/iterable/RangeOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Iterable implementation to model range functionality.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @param <T> Range value type
  * @since 1.0
  */
diff --git a/src/main/java/org/cactoos/iterable/Repeated.java b/src/main/java/org/cactoos/iterable/Repeated.java
index 4b083e0b1f..268b4f2aab 100644
--- a/src/main/java/org/cactoos/iterable/Repeated.java
+++ b/src/main/java/org/cactoos/iterable/Repeated.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,9 +31,6 @@
  *
  * <p>If you need to repeat endlessly, use {@link Endless}.</p>
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.1
  */
diff --git a/src/main/java/org/cactoos/iterable/Reversed.java b/src/main/java/org/cactoos/iterable/Reversed.java
index 3e5144579a..c5bd32f429 100644
--- a/src/main/java/org/cactoos/iterable/Reversed.java
+++ b/src/main/java/org/cactoos/iterable/Reversed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @see Filtered
  * @since 0.9
diff --git a/src/main/java/org/cactoos/iterable/Shuffled.java b/src/main/java/org/cactoos/iterable/Shuffled.java
index c3d6e49790..67f6fab36a 100644
--- a/src/main/java/org/cactoos/iterable/Shuffled.java
+++ b/src/main/java/org/cactoos/iterable/Shuffled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Ivan Shcherbak (alotofall@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.20
  */
diff --git a/src/main/java/org/cactoos/iterable/SolidIterable.java b/src/main/java/org/cactoos/iterable/SolidIterable.java
index 7fbe046a3d..0efd90fc90 100644
--- a/src/main/java/org/cactoos/iterable/SolidIterable.java
+++ b/src/main/java/org/cactoos/iterable/SolidIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.24
  */
diff --git a/src/main/java/org/cactoos/iterable/Sorted.java b/src/main/java/org/cactoos/iterable/Sorted.java
index 56bafb1621..d649924088 100644
--- a/src/main/java/org/cactoos/iterable/Sorted.java
+++ b/src/main/java/org/cactoos/iterable/Sorted.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Dusan Rychnovsky (dusan.rychnovsky@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.7
  */
diff --git a/src/main/java/org/cactoos/iterable/StickyIterable.java b/src/main/java/org/cactoos/iterable/StickyIterable.java
index 7356e878a4..c1bdca350e 100644
--- a/src/main/java/org/cactoos/iterable/StickyIterable.java
+++ b/src/main/java/org/cactoos/iterable/StickyIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.1
  */
diff --git a/src/main/java/org/cactoos/iterable/SyncIterable.java b/src/main/java/org/cactoos/iterable/SyncIterable.java
index 5280fc6fb5..2ef5ab7f09 100644
--- a/src/main/java/org/cactoos/iterable/SyncIterable.java
+++ b/src/main/java/org/cactoos/iterable/SyncIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,8 +37,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.24
  */
diff --git a/src/main/java/org/cactoos/iterable/TailOf.java b/src/main/java/org/cactoos/iterable/TailOf.java
index 5f0ea1370e..ed83b5bf5a 100644
--- a/src/main/java/org/cactoos/iterable/TailOf.java
+++ b/src/main/java/org/cactoos/iterable/TailOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/iterable/package-info.java b/src/main/java/org/cactoos/iterable/package-info.java
index 4c8a50c4d2..9ec9962947 100644
--- a/src/main/java/org/cactoos/iterable/package-info.java
+++ b/src/main/java/org/cactoos/iterable/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Iterables.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 package org.cactoos.iterable;
diff --git a/src/main/java/org/cactoos/iterator/Cycled.java b/src/main/java/org/cactoos/iterator/Cycled.java
index 26e79c7fab..8818343e72 100644
--- a/src/main/java/org/cactoos/iterator/Cycled.java
+++ b/src/main/java/org/cactoos/iterator/Cycled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @param <T> Type of item
  * @since 0.8
  */
diff --git a/src/main/java/org/cactoos/iterator/Endless.java b/src/main/java/org/cactoos/iterator/Endless.java
index 07a5a97962..469eb71663 100644
--- a/src/main/java/org/cactoos/iterator/Endless.java
+++ b/src/main/java/org/cactoos/iterator/Endless.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  * <p>If you need to repeat certain amount of time,
  * use {@link Repeated}.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.4
  */
diff --git a/src/main/java/org/cactoos/iterator/Filtered.java b/src/main/java/org/cactoos/iterator/Filtered.java
index 5dfa8d742a..eb663af64d 100644
--- a/src/main/java/org/cactoos/iterator/Filtered.java
+++ b/src/main/java/org/cactoos/iterator/Filtered.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -47,8 +47,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @see Filtered
  * @since 0.1
diff --git a/src/main/java/org/cactoos/iterator/HeadOf.java b/src/main/java/org/cactoos/iterator/HeadOf.java
index e4b68690f6..1f80132f87 100644
--- a/src/main/java/org/cactoos/iterator/HeadOf.java
+++ b/src/main/java/org/cactoos/iterator/HeadOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.8
  */
diff --git a/src/main/java/org/cactoos/iterator/IteratorNoNulls.java b/src/main/java/org/cactoos/iterator/IteratorNoNulls.java
index c33a97206d..d2c0356832 100644
--- a/src/main/java/org/cactoos/iterator/IteratorNoNulls.java
+++ b/src/main/java/org/cactoos/iterator/IteratorNoNulls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.27
  */
diff --git a/src/main/java/org/cactoos/iterator/IteratorOf.java b/src/main/java/org/cactoos/iterator/IteratorOf.java
index 5983658e0c..0fcf2f89e9 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOf.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.30
  */
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfBooleans.java b/src/main/java/org/cactoos/iterator/IteratorOfBooleans.java
index 71f7c536d4..f0ea483410 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfBooleans.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfBooleans.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.32
  */
 public final class IteratorOfBooleans implements Iterator<Boolean> {
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfChars.java b/src/main/java/org/cactoos/iterator/IteratorOfChars.java
index fe09986308..3fd4e17002 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfChars.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfChars.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.32
  */
 public final class IteratorOfChars implements Iterator<Character> {
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfFloats.java b/src/main/java/org/cactoos/iterator/IteratorOfFloats.java
index d7c15cf635..b1f0e588fc 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfFloats.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfFloats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.32
  */
 public final class IteratorOfFloats implements Iterator<Float> {
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfInts.java b/src/main/java/org/cactoos/iterator/IteratorOfInts.java
index 938fc77053..d775727ffa 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfInts.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfInts.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.32
  */
 public final class IteratorOfInts implements Iterator<Integer> {
diff --git a/src/main/java/org/cactoos/iterator/Joined.java b/src/main/java/org/cactoos/iterator/Joined.java
index 5a9ba3c2bf..24fd192d73 100644
--- a/src/main/java/org/cactoos/iterator/Joined.java
+++ b/src/main/java/org/cactoos/iterator/Joined.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of item
  * @since 0.1
  */
diff --git a/src/main/java/org/cactoos/iterator/LengthOf.java b/src/main/java/org/cactoos/iterator/LengthOf.java
index 45fa8420d3..f32b1c0c97 100644
--- a/src/main/java/org/cactoos/iterator/LengthOf.java
+++ b/src/main/java/org/cactoos/iterator/LengthOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class LengthOf extends NumberEnvelope {
diff --git a/src/main/java/org/cactoos/iterator/Mapped.java b/src/main/java/org/cactoos/iterator/Mapped.java
index ea383d315d..80b6ede611 100644
--- a/src/main/java/org/cactoos/iterator/Mapped.java
+++ b/src/main/java/org/cactoos/iterator/Mapped.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @param <Y> Type of target item
  * @since 0.1
diff --git a/src/main/java/org/cactoos/iterator/Partitioned.java b/src/main/java/org/cactoos/iterator/Partitioned.java
index 8415547ae5..b5a5bd0773 100644
--- a/src/main/java/org/cactoos/iterator/Partitioned.java
+++ b/src/main/java/org/cactoos/iterator/Partitioned.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Iterator implementation for {@link Iterator} partitioning.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @param <T> Partitions value type
  * @since 0.29
  */
diff --git a/src/main/java/org/cactoos/iterator/Repeated.java b/src/main/java/org/cactoos/iterator/Repeated.java
index 1b72d79693..d94f57e01a 100644
--- a/src/main/java/org/cactoos/iterator/Repeated.java
+++ b/src/main/java/org/cactoos/iterator/Repeated.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,9 +33,6 @@
  *
  * <p>If you need to repeat endlessly, use {@link Endless}.</p>
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.4
  */
diff --git a/src/main/java/org/cactoos/iterator/Shuffled.java b/src/main/java/org/cactoos/iterator/Shuffled.java
index a4f2c065b4..c12ee2e353 100644
--- a/src/main/java/org/cactoos/iterator/Shuffled.java
+++ b/src/main/java/org/cactoos/iterator/Shuffled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Ivan Shcherbak (alotofall@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.20
  */
diff --git a/src/main/java/org/cactoos/iterator/Sorted.java b/src/main/java/org/cactoos/iterator/Sorted.java
index 8319c09ca1..80d65c596b 100644
--- a/src/main/java/org/cactoos/iterator/Sorted.java
+++ b/src/main/java/org/cactoos/iterator/Sorted.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Dusan Rychnovsky (dusan.rychnovsky@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.7
  */
diff --git a/src/main/java/org/cactoos/iterator/SyncIterator.java b/src/main/java/org/cactoos/iterator/SyncIterator.java
index fa1de7a365..62c7e7ae64 100644
--- a/src/main/java/org/cactoos/iterator/SyncIterator.java
+++ b/src/main/java/org/cactoos/iterator/SyncIterator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @param <T> The type of the iterator.
  * @since 1.0
  */
diff --git a/src/main/java/org/cactoos/iterator/TailOf.java b/src/main/java/org/cactoos/iterator/TailOf.java
index 7f497dba77..60a8765321 100644
--- a/src/main/java/org/cactoos/iterator/TailOf.java
+++ b/src/main/java/org/cactoos/iterator/TailOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  * Tail portion of the iterator.
  *
  * <p>There is no thread-safety guarantee.</p>
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/iterator/package-info.java b/src/main/java/org/cactoos/iterator/package-info.java
index c87cdd2715..886080e470 100644
--- a/src/main/java/org/cactoos/iterator/package-info.java
+++ b/src/main/java/org/cactoos/iterator/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Iterators.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 package org.cactoos.iterator;
diff --git a/src/main/java/org/cactoos/list/Joined.java b/src/main/java/org/cactoos/list/Joined.java
index 402c8e8347..078d540070 100644
--- a/src/main/java/org/cactoos/list/Joined.java
+++ b/src/main/java/org/cactoos/list/Joined.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @since 0.20
  */
diff --git a/src/main/java/org/cactoos/list/ListEnvelope.java b/src/main/java/org/cactoos/list/ListEnvelope.java
index 744a0ec028..848c08cbcd 100644
--- a/src/main/java/org/cactoos/list/ListEnvelope.java
+++ b/src/main/java/org/cactoos/list/ListEnvelope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.23
  * @checkstyle AbstractClassNameCheck (500 lines)
diff --git a/src/main/java/org/cactoos/list/ListNoNulls.java b/src/main/java/org/cactoos/list/ListNoNulls.java
index d10abb61e5..6269d3816d 100644
--- a/src/main/java/org/cactoos/list/ListNoNulls.java
+++ b/src/main/java/org/cactoos/list/ListNoNulls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @since 0.27
  */
diff --git a/src/main/java/org/cactoos/list/ListOf.java b/src/main/java/org/cactoos/list/ListOf.java
index 8c3a339bde..0e1781727f 100644
--- a/src/main/java/org/cactoos/list/ListOf.java
+++ b/src/main/java/org/cactoos/list/ListOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,10 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Alexey Semenyuk (semenyukalexey88@gmail.com)
- * @author Kirill (g4s8.public@gmail.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> List type
  * @see StickyList
  * @since 0.1
diff --git a/src/main/java/org/cactoos/list/Mapped.java b/src/main/java/org/cactoos/list/Mapped.java
index 84536184b3..53cde388da 100644
--- a/src/main/java/org/cactoos/list/Mapped.java
+++ b/src/main/java/org/cactoos/list/Mapped.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @param <Y> Type of target item
  * @since 0.14
diff --git a/src/main/java/org/cactoos/list/Shuffled.java b/src/main/java/org/cactoos/list/Shuffled.java
index 902a9e66d2..4d262c7bb2 100644
--- a/src/main/java/org/cactoos/list/Shuffled.java
+++ b/src/main/java/org/cactoos/list/Shuffled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @see StickyList
  * @since 0.23
diff --git a/src/main/java/org/cactoos/list/SolidList.java b/src/main/java/org/cactoos/list/SolidList.java
index 1718cc0629..162a9e0920 100644
--- a/src/main/java/org/cactoos/list/SolidList.java
+++ b/src/main/java/org/cactoos/list/SolidList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.24
  */
diff --git a/src/main/java/org/cactoos/list/Sorted.java b/src/main/java/org/cactoos/list/Sorted.java
index df3a9ca0da..0c7d01457c 100644
--- a/src/main/java/org/cactoos/list/Sorted.java
+++ b/src/main/java/org/cactoos/list/Sorted.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Element type
  * @see StickyList
  * @since 0.19
diff --git a/src/main/java/org/cactoos/list/StickyList.java b/src/main/java/org/cactoos/list/StickyList.java
index e85fb6107f..0e25e68b2c 100644
--- a/src/main/java/org/cactoos/list/StickyList.java
+++ b/src/main/java/org/cactoos/list/StickyList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.8
  */
diff --git a/src/main/java/org/cactoos/list/SyncList.java b/src/main/java/org/cactoos/list/SyncList.java
index 3c09123afc..77403360ea 100644
--- a/src/main/java/org/cactoos/list/SyncList.java
+++ b/src/main/java/org/cactoos/list/SyncList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -45,8 +45,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of item
  * @since 0.24
  */
diff --git a/src/main/java/org/cactoos/list/package-info.java b/src/main/java/org/cactoos/list/package-info.java
index ee3e340422..971202fd5e 100644
--- a/src/main/java/org/cactoos/list/package-info.java
+++ b/src/main/java/org/cactoos/list/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Lists, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  */
 package org.cactoos.list;
diff --git a/src/main/java/org/cactoos/map/Grouped.java b/src/main/java/org/cactoos/map/Grouped.java
index 376d7b7353..e28c89226a 100644
--- a/src/main/java/org/cactoos/map/Grouped.java
+++ b/src/main/java/org/cactoos/map/Grouped.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @param <K> Type of key
  * @param <V> Type of value
  * @param <T> Type of entry objects of functions
diff --git a/src/main/java/org/cactoos/map/MapEntry.java b/src/main/java/org/cactoos/map/MapEntry.java
index 618f769673..970fe1e667 100644
--- a/src/main/java/org/cactoos/map/MapEntry.java
+++ b/src/main/java/org/cactoos/map/MapEntry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @param <K> Key type
  * @param <V> Value type
  * @since 0.9
diff --git a/src/main/java/org/cactoos/map/MapEnvelope.java b/src/main/java/org/cactoos/map/MapEnvelope.java
index 2e90de226d..db897c4347 100644
--- a/src/main/java/org/cactoos/map/MapEnvelope.java
+++ b/src/main/java/org/cactoos/map/MapEnvelope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of key
  * @param <Y> Type of value
  * @see StickyMap
diff --git a/src/main/java/org/cactoos/map/MapNoNulls.java b/src/main/java/org/cactoos/map/MapNoNulls.java
index ffd140201a..28f859eac3 100644
--- a/src/main/java/org/cactoos/map/MapNoNulls.java
+++ b/src/main/java/org/cactoos/map/MapNoNulls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <K> Type of key
  * @param <V> Type of value
  * @since 0.27
diff --git a/src/main/java/org/cactoos/map/MapOf.java b/src/main/java/org/cactoos/map/MapOf.java
index e246eac488..6c4e470526 100644
--- a/src/main/java/org/cactoos/map/MapOf.java
+++ b/src/main/java/org/cactoos/map/MapOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -43,8 +43,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of key
  * @param <Y> Type of value
  * @see StickyMap
diff --git a/src/main/java/org/cactoos/map/SolidMap.java b/src/main/java/org/cactoos/map/SolidMap.java
index 80d4aadc47..2b75636feb 100644
--- a/src/main/java/org/cactoos/map/SolidMap.java
+++ b/src/main/java/org/cactoos/map/SolidMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of key
  * @param <Y> Type of value
  * @since 0.24
diff --git a/src/main/java/org/cactoos/map/StickyMap.java b/src/main/java/org/cactoos/map/StickyMap.java
index 3e34bd3d89..86a4fb7510 100644
--- a/src/main/java/org/cactoos/map/StickyMap.java
+++ b/src/main/java/org/cactoos/map/StickyMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of key
  * @param <Y> Type of value
  * @since 0.8
diff --git a/src/main/java/org/cactoos/map/SyncMap.java b/src/main/java/org/cactoos/map/SyncMap.java
index 14b3387978..352b08c57d 100644
--- a/src/main/java/org/cactoos/map/SyncMap.java
+++ b/src/main/java/org/cactoos/map/SyncMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of key
  * @param <Y> Type of value
  * @since 0.24
diff --git a/src/main/java/org/cactoos/map/package-info.java b/src/main/java/org/cactoos/map/package-info.java
index 3aada69733..18b86c1c28 100644
--- a/src/main/java/org/cactoos/map/package-info.java
+++ b/src/main/java/org/cactoos/map/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Maps.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  */
 package org.cactoos.map;
diff --git a/src/main/java/org/cactoos/matchers/FuncApplies.java b/src/main/java/org/cactoos/matchers/FuncApplies.java
index 9a891647e5..bb7ac13fd8 100644
--- a/src/main/java/org/cactoos/matchers/FuncApplies.java
+++ b/src/main/java/org/cactoos/matchers/FuncApplies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Matcher for the value.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.2
diff --git a/src/main/java/org/cactoos/matchers/InputHasContent.java b/src/main/java/org/cactoos/matchers/InputHasContent.java
index 546cab1343..62875f7c29 100644
--- a/src/main/java/org/cactoos/matchers/InputHasContent.java
+++ b/src/main/java/org/cactoos/matchers/InputHasContent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Matcher for the input.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.11
  */
 public final class InputHasContent extends TypeSafeMatcher<Input> {
diff --git a/src/main/java/org/cactoos/matchers/MatcherOf.java b/src/main/java/org/cactoos/matchers/MatcherOf.java
index fa256d1f2e..5ffd09151e 100644
--- a/src/main/java/org/cactoos/matchers/MatcherOf.java
+++ b/src/main/java/org/cactoos/matchers/MatcherOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of object to match
  * @since 0.12
  */
diff --git a/src/main/java/org/cactoos/matchers/RunsInThreads.java b/src/main/java/org/cactoos/matchers/RunsInThreads.java
index b5bb4ce218..4d9317c8de 100644
--- a/src/main/java/org/cactoos/matchers/RunsInThreads.java
+++ b/src/main/java/org/cactoos/matchers/RunsInThreads.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
 /**
  * Matcher for {@link Func} that must run in multiple threads.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of input
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
diff --git a/src/main/java/org/cactoos/matchers/ScalarHasValue.java b/src/main/java/org/cactoos/matchers/ScalarHasValue.java
index cea13a6d2f..b86be18aa3 100644
--- a/src/main/java/org/cactoos/matchers/ScalarHasValue.java
+++ b/src/main/java/org/cactoos/matchers/ScalarHasValue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Matcher for the value.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of result
  * @since 0.2
  */
diff --git a/src/main/java/org/cactoos/matchers/TeeInputHasResult.java b/src/main/java/org/cactoos/matchers/TeeInputHasResult.java
index 625d35330e..bac3877fef 100644
--- a/src/main/java/org/cactoos/matchers/TeeInputHasResult.java
+++ b/src/main/java/org/cactoos/matchers/TeeInputHasResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
 /**
  * Matcher for the {@link TeeInput}'s results.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  */
 public final class TeeInputHasResult extends TypeSafeMatcher<TeeInput> {
diff --git a/src/main/java/org/cactoos/matchers/TextHasString.java b/src/main/java/org/cactoos/matchers/TextHasString.java
index f627d5cecd..5c25f813b5 100644
--- a/src/main/java/org/cactoos/matchers/TextHasString.java
+++ b/src/main/java/org/cactoos/matchers/TextHasString.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Matcher for the content.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.2
  */
 public final class TextHasString extends TypeSafeMatcher<Text> {
diff --git a/src/main/java/org/cactoos/matchers/package-info.java b/src/main/java/org/cactoos/matchers/package-info.java
index 09ecdd5ffd..2db4711b5a 100644
--- a/src/main/java/org/cactoos/matchers/package-info.java
+++ b/src/main/java/org/cactoos/matchers/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Matchers.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  */
 package org.cactoos.matchers;
diff --git a/src/main/java/org/cactoos/package-info.java b/src/main/java/org/cactoos/package-info.java
index c46b13ddb9..203886a3ca 100644
--- a/src/main/java/org/cactoos/package-info.java
+++ b/src/main/java/org/cactoos/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  * Feel free to contribute, if you find issues or have a need for
  * some other primitives.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  * @see <a href="http://www.cactoos.org">Project site www.cactoos.org</a>
  * @see <a href="https://github.com/yegor256/cactoos">GitHub repository</a>
diff --git a/src/main/java/org/cactoos/scalar/And.java b/src/main/java/org/cactoos/scalar/And.java
index fa69690453..d00007583e 100644
--- a/src/main/java/org/cactoos/scalar/And.java
+++ b/src/main/java/org/cactoos/scalar/And.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -73,8 +73,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @see UncheckedScalar
  * @see IoCheckedScalar
  * @since 0.8
diff --git a/src/main/java/org/cactoos/scalar/AndInThreads.java b/src/main/java/org/cactoos/scalar/AndInThreads.java
index 392015d539..dcba7f01ea 100644
--- a/src/main/java/org/cactoos/scalar/AndInThreads.java
+++ b/src/main/java/org/cactoos/scalar/AndInThreads.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -48,8 +48,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @see UncheckedScalar
  * @see IoCheckedScalar
  * @since 0.25
diff --git a/src/main/java/org/cactoos/scalar/AndWithIndex.java b/src/main/java/org/cactoos/scalar/AndWithIndex.java
index 702488c713..55f856bfd5 100644
--- a/src/main/java/org/cactoos/scalar/AndWithIndex.java
+++ b/src/main/java/org/cactoos/scalar/AndWithIndex.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -60,8 +60,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.20
  */
 public final class AndWithIndex implements Scalar<Boolean> {
diff --git a/src/main/java/org/cactoos/scalar/AvgOf.java b/src/main/java/org/cactoos/scalar/AvgOf.java
index 2108bc5161..ead642137f 100644
--- a/src/main/java/org/cactoos/scalar/AvgOf.java
+++ b/src/main/java/org/cactoos/scalar/AvgOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -48,9 +48,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle ExecutableStatementCountCheck (500 lines)
  * @checkstyle NPathComplexityCheck (500 lines)
diff --git a/src/main/java/org/cactoos/scalar/BoolOf.java b/src/main/java/org/cactoos/scalar/BoolOf.java
index c334922eca..1041ba13e9 100644
--- a/src/main/java/org/cactoos/scalar/BoolOf.java
+++ b/src/main/java/org/cactoos/scalar/BoolOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @since 0.2
  */
 public final class BoolOf implements Scalar<Boolean> {
diff --git a/src/main/java/org/cactoos/scalar/CheckedScalar.java b/src/main/java/org/cactoos/scalar/CheckedScalar.java
index 3b729940fc..23e8ed94a2 100644
--- a/src/main/java/org/cactoos/scalar/CheckedScalar.java
+++ b/src/main/java/org/cactoos/scalar/CheckedScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @param <T> Type of result
  * @param <E> Type of exception
  * @since 0.30
diff --git a/src/main/java/org/cactoos/scalar/Constant.java b/src/main/java/org/cactoos/scalar/Constant.java
index 6b2477675d..56ce7652ab 100644
--- a/src/main/java/org/cactoos/scalar/Constant.java
+++ b/src/main/java/org/cactoos/scalar/Constant.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -47,8 +47,6 @@
  *
  * <p>This class is thread-safe.</p>
  *
- * @author Aliceice (elena.ihde-simon@posteo.de)
- * @version $Id$
  * @param <T> Type of result
  * @see StickyScalar
  * @since 0.30
diff --git a/src/main/java/org/cactoos/scalar/Equality.java b/src/main/java/org/cactoos/scalar/Equality.java
index 75eb39d42a..454c127523 100644
--- a/src/main/java/org/cactoos/scalar/Equality.java
+++ b/src/main/java/org/cactoos/scalar/Equality.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @param <T> Type of input
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/scalar/Equals.java b/src/main/java/org/cactoos/scalar/Equals.java
index a706e9772d..75ff1a6cf3 100644
--- a/src/main/java/org/cactoos/scalar/Equals.java
+++ b/src/main/java/org/cactoos/scalar/Equals.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @param <T> Type of object to compare
  * @since 0.9
  */
diff --git a/src/main/java/org/cactoos/scalar/FallbackFrom.java b/src/main/java/org/cactoos/scalar/FallbackFrom.java
index b8d68e68e2..5828a6484b 100644
--- a/src/main/java/org/cactoos/scalar/FallbackFrom.java
+++ b/src/main/java/org/cactoos/scalar/FallbackFrom.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @param <T> Type of result
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/scalar/False.java b/src/main/java/org/cactoos/scalar/False.java
index 28bef1d0e2..8fa434ca35 100644
--- a/src/main/java/org/cactoos/scalar/False.java
+++ b/src/main/java/org/cactoos/scalar/False.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>This class is thread-safe.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.7
  */
 public final class False implements Scalar<Boolean> {
diff --git a/src/main/java/org/cactoos/scalar/Folded.java b/src/main/java/org/cactoos/scalar/Folded.java
index 890b7004cd..91015401a5 100644
--- a/src/main/java/org/cactoos/scalar/Folded.java
+++ b/src/main/java/org/cactoos/scalar/Folded.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Iterable, which elements are "folded" through the func.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of element
  * @param <X> Type of input and output
  * @since 0.30
diff --git a/src/main/java/org/cactoos/scalar/HighestOf.java b/src/main/java/org/cactoos/scalar/HighestOf.java
index 0dbf2f5db3..2f674461b5 100644
--- a/src/main/java/org/cactoos/scalar/HighestOf.java
+++ b/src/main/java/org/cactoos/scalar/HighestOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -50,9 +50,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @author Eduard Balovnev (bedward70@mail.ru)
- * @version $Id$
  * @param <T> Scalar type
  * @see UncheckedScalar
  * @see IoCheckedScalar
diff --git a/src/main/java/org/cactoos/scalar/InheritanceLevel.java b/src/main/java/org/cactoos/scalar/InheritanceLevel.java
index 8e69647507..e534b4fa25 100644
--- a/src/main/java/org/cactoos/scalar/InheritanceLevel.java
+++ b/src/main/java/org/cactoos/scalar/InheritanceLevel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -42,8 +42,6 @@
  *     FileNotFoundException with Exception).
  * </ul>
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 0.30
  */
 public final class InheritanceLevel implements Scalar<Integer> {
diff --git a/src/main/java/org/cactoos/scalar/IoCheckedScalar.java b/src/main/java/org/cactoos/scalar/IoCheckedScalar.java
index e7a5cf5204..b6c8f19f78 100644
--- a/src/main/java/org/cactoos/scalar/IoCheckedScalar.java
+++ b/src/main/java/org/cactoos/scalar/IoCheckedScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,8 +37,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of result
  * @since 0.4
  */
diff --git a/src/main/java/org/cactoos/scalar/ItemAt.java b/src/main/java/org/cactoos/scalar/ItemAt.java
index fa2cf46990..1750f22642 100644
--- a/src/main/java/org/cactoos/scalar/ItemAt.java
+++ b/src/main/java/org/cactoos/scalar/ItemAt.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @param <T> Scalar type
  * @since 0.7
  */
diff --git a/src/main/java/org/cactoos/scalar/LowestOf.java b/src/main/java/org/cactoos/scalar/LowestOf.java
index f8d643864f..08b5741588 100644
--- a/src/main/java/org/cactoos/scalar/LowestOf.java
+++ b/src/main/java/org/cactoos/scalar/LowestOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -50,9 +50,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @author Eduard Balovnev (bedward70@mail.ru)
- * @version $Id$
  * @param <T> Scalar type
  * @see UncheckedScalar
  * @see IoCheckedScalar
diff --git a/src/main/java/org/cactoos/scalar/MaxOf.java b/src/main/java/org/cactoos/scalar/MaxOf.java
index 122a9b33b2..d1c95cce79 100644
--- a/src/main/java/org/cactoos/scalar/MaxOf.java
+++ b/src/main/java/org/cactoos/scalar/MaxOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -44,9 +44,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @see UncheckedScalar
  * @see IoCheckedScalar
  * @since 0.24
diff --git a/src/main/java/org/cactoos/scalar/MinOf.java b/src/main/java/org/cactoos/scalar/MinOf.java
index de7e30bec7..507b40961a 100644
--- a/src/main/java/org/cactoos/scalar/MinOf.java
+++ b/src/main/java/org/cactoos/scalar/MinOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -44,9 +44,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  */
 @SuppressWarnings(
diff --git a/src/main/java/org/cactoos/scalar/Not.java b/src/main/java/org/cactoos/scalar/Not.java
index c52f6c9a03..2ff017b0f6 100644
--- a/src/main/java/org/cactoos/scalar/Not.java
+++ b/src/main/java/org/cactoos/scalar/Not.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.7
  */
 public final class Not implements Scalar<Boolean> {
diff --git a/src/main/java/org/cactoos/scalar/NumberEnvelope.java b/src/main/java/org/cactoos/scalar/NumberEnvelope.java
index 99bc78c532..c64ccaccd9 100644
--- a/src/main/java/org/cactoos/scalar/NumberEnvelope.java
+++ b/src/main/java/org/cactoos/scalar/NumberEnvelope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.26
  * @checkstyle AbstractClassNameCheck (500 lines)
  */
diff --git a/src/main/java/org/cactoos/scalar/NumberOf.java b/src/main/java/org/cactoos/scalar/NumberOf.java
index ce1cec5ce4..5641d27c00 100644
--- a/src/main/java/org/cactoos/scalar/NumberOf.java
+++ b/src/main/java/org/cactoos/scalar/NumberOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -43,8 +43,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @since 0.2
  */
 public final class NumberOf extends Number implements Scalar<Number> {
diff --git a/src/main/java/org/cactoos/scalar/Or.java b/src/main/java/org/cactoos/scalar/Or.java
index d975948b0e..7c6aec9562 100644
--- a/src/main/java/org/cactoos/scalar/Or.java
+++ b/src/main/java/org/cactoos/scalar/Or.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -74,9 +74,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.8
  */
 public final class Or implements Scalar<Boolean> {
diff --git a/src/main/java/org/cactoos/scalar/PropertiesOf.java b/src/main/java/org/cactoos/scalar/PropertiesOf.java
index 1d360319ca..e6ff3e6c06 100644
--- a/src/main/java/org/cactoos/scalar/PropertiesOf.java
+++ b/src/main/java/org/cactoos/scalar/PropertiesOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -42,9 +42,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
diff --git a/src/main/java/org/cactoos/scalar/Reduced.java b/src/main/java/org/cactoos/scalar/Reduced.java
index 5b0314fd7b..c0e4831d9a 100644
--- a/src/main/java/org/cactoos/scalar/Reduced.java
+++ b/src/main/java/org/cactoos/scalar/Reduced.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -68,9 +68,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Alexander Dyadyushenko (gookven@gmail.com)
- * @author Eduard Balovnev (bedward70@mail.ru)
- * @version $Id$
  * @param <T> Scalar type
  * @since 0.30
  */
diff --git a/src/main/java/org/cactoos/scalar/RetryScalar.java b/src/main/java/org/cactoos/scalar/RetryScalar.java
index 5a43fc6168..72430b69bd 100644
--- a/src/main/java/org/cactoos/scalar/RetryScalar.java
+++ b/src/main/java/org/cactoos/scalar/RetryScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -49,8 +49,6 @@
  * it more convenient and get rid of the checked exception you can
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of output
  * @since 0.9
  */
diff --git a/src/main/java/org/cactoos/scalar/ScalarWithFallback.java b/src/main/java/org/cactoos/scalar/ScalarWithFallback.java
index 436259bd0e..55d1f8eaef 100644
--- a/src/main/java/org/cactoos/scalar/ScalarWithFallback.java
+++ b/src/main/java/org/cactoos/scalar/ScalarWithFallback.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @param <T> Type of result
  * @since 0.31
  */
diff --git a/src/main/java/org/cactoos/scalar/SolidScalar.java b/src/main/java/org/cactoos/scalar/SolidScalar.java
index 94cc0d8b66..a7552b6491 100644
--- a/src/main/java/org/cactoos/scalar/SolidScalar.java
+++ b/src/main/java/org/cactoos/scalar/SolidScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>Objects of this class are thread safe.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of result
  * @see StickyScalar
  * @see SyncScalar
diff --git a/src/main/java/org/cactoos/scalar/StickyScalar.java b/src/main/java/org/cactoos/scalar/StickyScalar.java
index 118bc2fedb..3bdbe6f191 100644
--- a/src/main/java/org/cactoos/scalar/StickyScalar.java
+++ b/src/main/java/org/cactoos/scalar/StickyScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -52,9 +52,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Tim Hinkes (timmeey@timmeey.de)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of result
  * @see StickyFunc
  * @since 0.3
diff --git a/src/main/java/org/cactoos/scalar/SumOf.java b/src/main/java/org/cactoos/scalar/SumOf.java
index 92538901d7..cbba01b610 100644
--- a/src/main/java/org/cactoos/scalar/SumOf.java
+++ b/src/main/java/org/cactoos/scalar/SumOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -47,9 +47,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 @SuppressWarnings(
diff --git a/src/main/java/org/cactoos/scalar/SumOfDoubleScalar.java b/src/main/java/org/cactoos/scalar/SumOfDoubleScalar.java
index 5bd51abf2c..1cd1ed860b 100644
--- a/src/main/java/org/cactoos/scalar/SumOfDoubleScalar.java
+++ b/src/main/java/org/cactoos/scalar/SumOfDoubleScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  */
 public final class SumOfDoubleScalar implements Scalar<Double> {
diff --git a/src/main/java/org/cactoos/scalar/SumOfFloatScalar.java b/src/main/java/org/cactoos/scalar/SumOfFloatScalar.java
index 24571b2a90..83819d4851 100644
--- a/src/main/java/org/cactoos/scalar/SumOfFloatScalar.java
+++ b/src/main/java/org/cactoos/scalar/SumOfFloatScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  */
 public final class SumOfFloatScalar implements Scalar<Float> {
diff --git a/src/main/java/org/cactoos/scalar/SumOfIntScalar.java b/src/main/java/org/cactoos/scalar/SumOfIntScalar.java
index 06afa1d2cd..8ac91a19a7 100644
--- a/src/main/java/org/cactoos/scalar/SumOfIntScalar.java
+++ b/src/main/java/org/cactoos/scalar/SumOfIntScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  */
 public final class SumOfIntScalar implements Scalar<Integer> {
diff --git a/src/main/java/org/cactoos/scalar/SumOfLongScalar.java b/src/main/java/org/cactoos/scalar/SumOfLongScalar.java
index 5e61c79d7f..47ef7edd7c 100644
--- a/src/main/java/org/cactoos/scalar/SumOfLongScalar.java
+++ b/src/main/java/org/cactoos/scalar/SumOfLongScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  */
 public final class SumOfLongScalar implements Scalar<Long> {
diff --git a/src/main/java/org/cactoos/scalar/SumOfScalar.java b/src/main/java/org/cactoos/scalar/SumOfScalar.java
index 2fb325b24b..ac372f53bd 100644
--- a/src/main/java/org/cactoos/scalar/SumOfScalar.java
+++ b/src/main/java/org/cactoos/scalar/SumOfScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
  * <p>There is no thread-safety guarantee.
  * <p>Note this class is for internal usage only
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  */
 final class SumOfScalar implements Scalar<SumOf> {
diff --git a/src/main/java/org/cactoos/scalar/SyncScalar.java b/src/main/java/org/cactoos/scalar/SyncScalar.java
index 54de209828..c473ece1df 100644
--- a/src/main/java/org/cactoos/scalar/SyncScalar.java
+++ b/src/main/java/org/cactoos/scalar/SyncScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -43,8 +43,6 @@
  *
  * <p>Objects of this class are thread-safe.</p>
  *
- * @author Tim Hinkes (timmeey@timmeey.de)
- * @version $Id$
  * @param <T> Type of result
  * @since 0.3
  */
diff --git a/src/main/java/org/cactoos/scalar/Ternary.java b/src/main/java/org/cactoos/scalar/Ternary.java
index ac8fcaf966..e3d39e0e51 100644
--- a/src/main/java/org/cactoos/scalar/Ternary.java
+++ b/src/main/java/org/cactoos/scalar/Ternary.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -45,8 +45,6 @@
  * ).value() // will be equal to 8
  * </pre>
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @param <T> Type of item.
  * @since 0.8
  */
diff --git a/src/main/java/org/cactoos/scalar/True.java b/src/main/java/org/cactoos/scalar/True.java
index 7f52681af4..3d0b1f6e91 100644
--- a/src/main/java/org/cactoos/scalar/True.java
+++ b/src/main/java/org/cactoos/scalar/True.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>This class is thread-safe.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.7
  */
 public final class True implements Scalar<Boolean> {
diff --git a/src/main/java/org/cactoos/scalar/UncheckedScalar.java b/src/main/java/org/cactoos/scalar/UncheckedScalar.java
index 47e50c750c..51b2d5a949 100644
--- a/src/main/java/org/cactoos/scalar/UncheckedScalar.java
+++ b/src/main/java/org/cactoos/scalar/UncheckedScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @param <T> Type of result
  * @since 0.3
  */
diff --git a/src/main/java/org/cactoos/scalar/package-info.java b/src/main/java/org/cactoos/scalar/package-info.java
index 0aa9e1eca1..c2fb632b87 100644
--- a/src/main/java/org/cactoos/scalar/package-info.java
+++ b/src/main/java/org/cactoos/scalar/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Scalars.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 package org.cactoos.scalar;
diff --git a/src/main/java/org/cactoos/text/AbbreviatedText.java b/src/main/java/org/cactoos/text/AbbreviatedText.java
index 93e621a4a5..5e08b1fcb4 100644
--- a/src/main/java/org/cactoos/text/AbbreviatedText.java
+++ b/src/main/java/org/cactoos/text/AbbreviatedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 public final class AbbreviatedText implements Text {
diff --git a/src/main/java/org/cactoos/text/Base64Text.java b/src/main/java/org/cactoos/text/Base64Text.java
index b118aa565e..e45c5dd6a3 100644
--- a/src/main/java/org/cactoos/text/Base64Text.java
+++ b/src/main/java/org/cactoos/text/Base64Text.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Decodes the origin text using the Base64 encoding scheme.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 public final class Base64Text implements Text {
diff --git a/src/main/java/org/cactoos/text/ComparableText.java b/src/main/java/org/cactoos/text/ComparableText.java
index eaa03cc654..b2ac570a64 100644
--- a/src/main/java/org/cactoos/text/ComparableText.java
+++ b/src/main/java/org/cactoos/text/ComparableText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Sergey Sharov (zefick@mail.ru)
- * @version $Id$
  * @since 0.27
  */
 public final class ComparableText implements Text, Comparable<Text> {
diff --git a/src/main/java/org/cactoos/text/FormattedText.java b/src/main/java/org/cactoos/text/FormattedText.java
index eab53d2e2d..f917425499 100644
--- a/src/main/java/org/cactoos/text/FormattedText.java
+++ b/src/main/java/org/cactoos/text/FormattedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class FormattedText implements Text {
diff --git a/src/main/java/org/cactoos/text/HexOf.java b/src/main/java/org/cactoos/text/HexOf.java
index 96900535ae..5e086fc71a 100644
--- a/src/main/java/org/cactoos/text/HexOf.java
+++ b/src/main/java/org/cactoos/text/HexOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.28
  */
 @SuppressWarnings("PMD.ConstructorShouldDoInitialization")
diff --git a/src/main/java/org/cactoos/text/IsBlank.java b/src/main/java/org/cactoos/text/IsBlank.java
index f75c2ed64b..5d51e81a0c 100644
--- a/src/main/java/org/cactoos/text/IsBlank.java
+++ b/src/main/java/org/cactoos/text/IsBlank.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Andriy Kryvtsun (kontiky@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class IsBlank implements Scalar<Boolean> {
diff --git a/src/main/java/org/cactoos/text/JoinedText.java b/src/main/java/org/cactoos/text/JoinedText.java
index 8eaa39e1e4..c931c0ca23 100644
--- a/src/main/java/org/cactoos/text/JoinedText.java
+++ b/src/main/java/org/cactoos/text/JoinedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 public final class JoinedText implements Text {
diff --git a/src/main/java/org/cactoos/text/LowerText.java b/src/main/java/org/cactoos/text/LowerText.java
index d1ad436f36..7f14c6cf33 100644
--- a/src/main/java/org/cactoos/text/LowerText.java
+++ b/src/main/java/org/cactoos/text/LowerText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class LowerText implements Text {
diff --git a/src/main/java/org/cactoos/text/NormalizedText.java b/src/main/java/org/cactoos/text/NormalizedText.java
index 4efe9a20ce..9c1d7665d0 100644
--- a/src/main/java/org/cactoos/text/NormalizedText.java
+++ b/src/main/java/org/cactoos/text/NormalizedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,9 +30,6 @@
  * Normalize (replace sequences of whitespace characters by a single space)
  * a Text.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 public final class NormalizedText implements Text {
diff --git a/src/main/java/org/cactoos/text/PaddedStartText.java b/src/main/java/org/cactoos/text/PaddedStartText.java
index 5fe519e601..e6cff23754 100644
--- a/src/main/java/org/cactoos/text/PaddedStartText.java
+++ b/src/main/java/org/cactoos/text/PaddedStartText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is thread safe.
  *
- * @author Vivek Poddar (vivekimsit@gmail.com)
- * @version $Id$
  * @since 0.32
  */
 public final class PaddedStartText implements Text {
diff --git a/src/main/java/org/cactoos/text/RandomText.java b/src/main/java/org/cactoos/text/RandomText.java
index 00b01f6ec3..2d8c37b1b2 100644
--- a/src/main/java/org/cactoos/text/RandomText.java
+++ b/src/main/java/org/cactoos/text/RandomText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.32
  */
 public final class RandomText implements Text {
diff --git a/src/main/java/org/cactoos/text/RepeatedText.java b/src/main/java/org/cactoos/text/RepeatedText.java
index bc3d16d8b2..54c30565ad 100644
--- a/src/main/java/org/cactoos/text/RepeatedText.java
+++ b/src/main/java/org/cactoos/text/RepeatedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 public final class RepeatedText implements Text {
diff --git a/src/main/java/org/cactoos/text/ReplacedText.java b/src/main/java/org/cactoos/text/ReplacedText.java
index f46e52367f..998eb19714 100644
--- a/src/main/java/org/cactoos/text/ReplacedText.java
+++ b/src/main/java/org/cactoos/text/ReplacedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Replace the Text.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.2
  */
 public final class ReplacedText implements Text {
diff --git a/src/main/java/org/cactoos/text/ReversedText.java b/src/main/java/org/cactoos/text/ReversedText.java
index c9704f488e..a97ae15b19 100644
--- a/src/main/java/org/cactoos/text/ReversedText.java
+++ b/src/main/java/org/cactoos/text/ReversedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Reverse the Text.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.2
  */
 public final class ReversedText implements Text {
diff --git a/src/main/java/org/cactoos/text/RotatedText.java b/src/main/java/org/cactoos/text/RotatedText.java
index 5bd2ab8067..39acb78732 100644
--- a/src/main/java/org/cactoos/text/RotatedText.java
+++ b/src/main/java/org/cactoos/text/RotatedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
 
 /**
  * Rotate (circular shift) a String of shift characters.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 public final class RotatedText implements Text {
diff --git a/src/main/java/org/cactoos/text/SplitText.java b/src/main/java/org/cactoos/text/SplitText.java
index 45a59cad55..3f4d63a03b 100644
--- a/src/main/java/org/cactoos/text/SplitText.java
+++ b/src/main/java/org/cactoos/text/SplitText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Split the Text.
  *
- * @author Alexey Semenyuk (semenyukalexey88@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 public final class SplitText implements Iterable<Text> {
diff --git a/src/main/java/org/cactoos/text/SubText.java b/src/main/java/org/cactoos/text/SubText.java
index d02d31f792..029899dbab 100644
--- a/src/main/java/org/cactoos/text/SubText.java
+++ b/src/main/java/org/cactoos/text/SubText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  */
 public final class SubText implements Text {
diff --git a/src/main/java/org/cactoos/text/SwappedCaseText.java b/src/main/java/org/cactoos/text/SwappedCaseText.java
index b466b1f563..f8b4e00609 100644
--- a/src/main/java/org/cactoos/text/SwappedCaseText.java
+++ b/src/main/java/org/cactoos/text/SwappedCaseText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Swaps the case of a Text changing upper and title case to lower case,
  * and lower case to upper case.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.13.3
  */
 public final class SwappedCaseText implements Text {
diff --git a/src/main/java/org/cactoos/text/SyncText.java b/src/main/java/org/cactoos/text/SyncText.java
index c342110898..bae7213abc 100644
--- a/src/main/java/org/cactoos/text/SyncText.java
+++ b/src/main/java/org/cactoos/text/SyncText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>Objects of this class are thread safe.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.18
  */
 public final class SyncText implements Text {
diff --git a/src/main/java/org/cactoos/text/TextBase64.java b/src/main/java/org/cactoos/text/TextBase64.java
index 80a44cc43a..f6c2d9874c 100644
--- a/src/main/java/org/cactoos/text/TextBase64.java
+++ b/src/main/java/org/cactoos/text/TextBase64.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Encodes the origin text using the Base64 encoding scheme.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 public final class TextBase64 implements Text {
diff --git a/src/main/java/org/cactoos/text/TextEnvelope.java b/src/main/java/org/cactoos/text/TextEnvelope.java
index 975c03b146..6a5fba78ca 100644
--- a/src/main/java/org/cactoos/text/TextEnvelope.java
+++ b/src/main/java/org/cactoos/text/TextEnvelope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Text envelope that provides {@link #equals(Object)} and {@link #hashCode()}
  * methods.
- * @author Paulo Lobo (pauloeduardolobo@gmail.com)
- * @version $Id$
  * @since 0.32
  * @todo #788:30min Refactor all classes in text package to extend from
  *  TextEnvelope, allowing direct comparison with string objects using hashCode
diff --git a/src/main/java/org/cactoos/text/TextOf.java b/src/main/java/org/cactoos/text/TextOf.java
index 189fd64d78..f5ad79d7e2 100644
--- a/src/main/java/org/cactoos/text/TextOf.java
+++ b/src/main/java/org/cactoos/text/TextOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -47,8 +47,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @since 0.12
  */
 public final class TextOf implements Text {
diff --git a/src/main/java/org/cactoos/text/TrimmedLeftText.java b/src/main/java/org/cactoos/text/TrimmedLeftText.java
index 5028632c49..3815424348 100644
--- a/src/main/java/org/cactoos/text/TrimmedLeftText.java
+++ b/src/main/java/org/cactoos/text/TrimmedLeftText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 public final class TrimmedLeftText implements Text {
diff --git a/src/main/java/org/cactoos/text/TrimmedRightText.java b/src/main/java/org/cactoos/text/TrimmedRightText.java
index dcf958d963..a5692dbd03 100644
--- a/src/main/java/org/cactoos/text/TrimmedRightText.java
+++ b/src/main/java/org/cactoos/text/TrimmedRightText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 public final class TrimmedRightText implements Text {
diff --git a/src/main/java/org/cactoos/text/TrimmedText.java b/src/main/java/org/cactoos/text/TrimmedText.java
index 1e946f3a3b..50d23d31f8 100644
--- a/src/main/java/org/cactoos/text/TrimmedText.java
+++ b/src/main/java/org/cactoos/text/TrimmedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class TrimmedText implements Text {
diff --git a/src/main/java/org/cactoos/text/UncheckedText.java b/src/main/java/org/cactoos/text/UncheckedText.java
index 71fe5a0df2..f844c4ea57 100644
--- a/src/main/java/org/cactoos/text/UncheckedText.java
+++ b/src/main/java/org/cactoos/text/UncheckedText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.3
  */
 public final class UncheckedText implements Text {
diff --git a/src/main/java/org/cactoos/text/UpperText.java b/src/main/java/org/cactoos/text/UpperText.java
index e7582deb76..cc50771ce9 100644
--- a/src/main/java/org/cactoos/text/UpperText.java
+++ b/src/main/java/org/cactoos/text/UpperText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 public final class UpperText implements Text {
diff --git a/src/main/java/org/cactoos/text/package-info.java b/src/main/java/org/cactoos/text/package-info.java
index 74f7ba0e8d..d2490d2251 100644
--- a/src/main/java/org/cactoos/text/package-info.java
+++ b/src/main/java/org/cactoos/text/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Text.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 package org.cactoos.text;
diff --git a/src/main/java/org/cactoos/time/DateAsText.java b/src/main/java/org/cactoos/time/DateAsText.java
index 75dc85cf4b..2cc41abdb7 100644
--- a/src/main/java/org/cactoos/time/DateAsText.java
+++ b/src/main/java/org/cactoos/time/DateAsText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 
 /**
  * Formatter for {@link Date} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
diff --git a/src/main/java/org/cactoos/time/DateOf.java b/src/main/java/org/cactoos/time/DateOf.java
index 69b4538527..9e38ffe163 100644
--- a/src/main/java/org/cactoos/time/DateOf.java
+++ b/src/main/java/org/cactoos/time/DateOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Parser for {@link Date} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 public final class DateOf implements Scalar<Date> {
diff --git a/src/main/java/org/cactoos/time/Iso.java b/src/main/java/org/cactoos/time/Iso.java
index 4f99bd06b6..162c6f4801 100644
--- a/src/main/java/org/cactoos/time/Iso.java
+++ b/src/main/java/org/cactoos/time/Iso.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -27,8 +27,6 @@
 
 /**
  * The formatter.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 final class Iso {
diff --git a/src/main/java/org/cactoos/time/LocalDateAsText.java b/src/main/java/org/cactoos/time/LocalDateAsText.java
index 6b843f2bfb..fdd0bd9c85 100644
--- a/src/main/java/org/cactoos/time/LocalDateAsText.java
+++ b/src/main/java/org/cactoos/time/LocalDateAsText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 
 /**
  * Formatter for {@link java.time.LocalDate} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
diff --git a/src/main/java/org/cactoos/time/LocalDateTimeAsText.java b/src/main/java/org/cactoos/time/LocalDateTimeAsText.java
index 814b2ac96f..d22b66a30d 100644
--- a/src/main/java/org/cactoos/time/LocalDateTimeAsText.java
+++ b/src/main/java/org/cactoos/time/LocalDateTimeAsText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Formatter for {@link java.time.LocalDateTime} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
diff --git a/src/main/java/org/cactoos/time/LocalDateTimeOf.java b/src/main/java/org/cactoos/time/LocalDateTimeOf.java
index 301ae6fef5..8e2ac2cec4 100644
--- a/src/main/java/org/cactoos/time/LocalDateTimeOf.java
+++ b/src/main/java/org/cactoos/time/LocalDateTimeOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Parser for {@link LocalDateTime} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 public final class LocalDateTimeOf implements Scalar<LocalDateTime> {
diff --git a/src/main/java/org/cactoos/time/OffsetDateTimeAsText.java b/src/main/java/org/cactoos/time/OffsetDateTimeAsText.java
index 1e09ac17a0..7f8ec4e953 100644
--- a/src/main/java/org/cactoos/time/OffsetDateTimeAsText.java
+++ b/src/main/java/org/cactoos/time/OffsetDateTimeAsText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Formatter for {@link java.time.OffsetDateTime} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
diff --git a/src/main/java/org/cactoos/time/OffsetDateTimeOf.java b/src/main/java/org/cactoos/time/OffsetDateTimeOf.java
index 3cc4b6defd..901471937a 100644
--- a/src/main/java/org/cactoos/time/OffsetDateTimeOf.java
+++ b/src/main/java/org/cactoos/time/OffsetDateTimeOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Parser for {@link OffsetDateTime} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 public final class OffsetDateTimeOf implements Scalar<OffsetDateTime> {
diff --git a/src/main/java/org/cactoos/time/ZonedDateTimeAsText.java b/src/main/java/org/cactoos/time/ZonedDateTimeAsText.java
index e157745ffd..365addb6be 100644
--- a/src/main/java/org/cactoos/time/ZonedDateTimeAsText.java
+++ b/src/main/java/org/cactoos/time/ZonedDateTimeAsText.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Formatter for {@link java.time.ZonedDateTime} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
diff --git a/src/main/java/org/cactoos/time/ZonedDateTimeOf.java b/src/main/java/org/cactoos/time/ZonedDateTimeOf.java
index 1e9471f654..05f5192a24 100644
--- a/src/main/java/org/cactoos/time/ZonedDateTimeOf.java
+++ b/src/main/java/org/cactoos/time/ZonedDateTimeOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Parser for {@link ZonedDateTime} instances.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.27
  */
 public final class ZonedDateTimeOf implements Scalar<ZonedDateTime> {
diff --git a/src/main/java/org/cactoos/time/package-info.java b/src/main/java/org/cactoos/time/package-info.java
index e509a463d2..6933cf01cd 100644
--- a/src/main/java/org/cactoos/time/package-info.java
+++ b/src/main/java/org/cactoos/time/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Time.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 package org.cactoos.time;
diff --git a/src/test/java/org/cactoos/BiFuncTest.java b/src/test/java/org/cactoos/BiFuncTest.java
index dcdfa26280..914a8023f8 100644
--- a/src/test/java/org/cactoos/BiFuncTest.java
+++ b/src/test/java/org/cactoos/BiFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -27,8 +27,6 @@
 
 /**
  * Test case for {@link BiFunc.NoNulls}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/BytesTest.java b/src/test/java/org/cactoos/BytesTest.java
index 40aad580cc..92c21ad512 100644
--- a/src/test/java/org/cactoos/BytesTest.java
+++ b/src/test/java/org/cactoos/BytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
 
 /**
  * Test case for {@link Bytes.NoNulls}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/FuncTest.java b/src/test/java/org/cactoos/FuncTest.java
index 25e662f406..55de0f38b4 100644
--- a/src/test/java/org/cactoos/FuncTest.java
+++ b/src/test/java/org/cactoos/FuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
 
 /**
  * Test case for {@link Func.NoNulls}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.10
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/InputTest.java b/src/test/java/org/cactoos/InputTest.java
index 4f720a1005..239ccb945d 100644
--- a/src/test/java/org/cactoos/InputTest.java
+++ b/src/test/java/org/cactoos/InputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link Input.NoNulls}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.10
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/OutputTest.java b/src/test/java/org/cactoos/OutputTest.java
index 1850373be6..a38ec294fc 100644
--- a/src/test/java/org/cactoos/OutputTest.java
+++ b/src/test/java/org/cactoos/OutputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link Output.NoNulls}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.10
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/ProcTest.java b/src/test/java/org/cactoos/ProcTest.java
index 12f99f8882..32abddcd7e 100644
--- a/src/test/java/org/cactoos/ProcTest.java
+++ b/src/test/java/org/cactoos/ProcTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test case for {@link Proc.NoNulls}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
@@ -50,7 +48,7 @@ public void failForNullInput() throws Exception {
     @Test
     public void okForNoNulls() throws Exception {
         final AtomicInteger counter = new AtomicInteger();
-        new Proc.NoNulls<AtomicInteger>(input -> { input.incrementAndGet(); })
+        new Proc.NoNulls<>(AtomicInteger::incrementAndGet)
             .exec(counter);
         MatcherAssert.assertThat(
             "Can't involve the \"Proc.exec(X input)\" method",
diff --git a/src/test/java/org/cactoos/ScalarTest.java b/src/test/java/org/cactoos/ScalarTest.java
index cbcad2d9a4..bc7ae6d040 100644
--- a/src/test/java/org/cactoos/ScalarTest.java
+++ b/src/test/java/org/cactoos/ScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -27,8 +27,6 @@
 
 /**
  * Test case for {@link Scalar.NoNulls}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/TextTest.java b/src/test/java/org/cactoos/TextTest.java
index 38a7e7fccb..84a3f0337a 100644
--- a/src/test/java/org/cactoos/TextTest.java
+++ b/src/test/java/org/cactoos/TextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for {@link Text}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/bytes/Base64BytesTest.java b/src/test/java/org/cactoos/bytes/Base64BytesTest.java
index 9e6654d242..a076634378 100644
--- a/src/test/java/org/cactoos/bytes/Base64BytesTest.java
+++ b/src/test/java/org/cactoos/bytes/Base64BytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link org.cactoos.bytes.Base64Bytes}.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/bytes/BytesBase64Test.java b/src/test/java/org/cactoos/bytes/BytesBase64Test.java
index f62ddd0808..f6545c3807 100644
--- a/src/test/java/org/cactoos/bytes/BytesBase64Test.java
+++ b/src/test/java/org/cactoos/bytes/BytesBase64Test.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 
 /**
  * Test case for {@link org.cactoos.bytes.BytesBase64}.
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/bytes/HexBytesTest.java b/src/test/java/org/cactoos/bytes/HexBytesTest.java
index 6be2b7a3df..77f8bfc21f 100644
--- a/src/test/java/org/cactoos/bytes/HexBytesTest.java
+++ b/src/test/java/org/cactoos/bytes/HexBytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link HexBytes}.
  *
- * @author Alexander Menshikov (sharplermc@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle MagicNumberCheck (500 line)
  * @checkstyle JavadocMethodCheck (500 line)
diff --git a/src/test/java/org/cactoos/bytes/package-info.java b/src/test/java/org/cactoos/bytes/package-info.java
index 9c729e800a..6ff957757c 100644
--- a/src/test/java/org/cactoos/bytes/package-info.java
+++ b/src/test/java/org/cactoos/bytes/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Bytes, tests.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 package org.cactoos.bytes;
diff --git a/src/test/java/org/cactoos/collection/BehavesAsCollection.java b/src/test/java/org/cactoos/collection/BehavesAsCollection.java
index 848c3d12a0..3e442cdf87 100644
--- a/src/test/java/org/cactoos/collection/BehavesAsCollection.java
+++ b/src/test/java/org/cactoos/collection/BehavesAsCollection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Matcher for collection.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <E> Type of source item
  * @since 0.23
  * @checkstyle JavadocMethodCheck (500 lines)
diff --git a/src/test/java/org/cactoos/collection/CollectionOfTest.java b/src/test/java/org/cactoos/collection/CollectionOfTest.java
index d38d94c687..6604272e44 100644
--- a/src/test/java/org/cactoos/collection/CollectionOfTest.java
+++ b/src/test/java/org/cactoos/collection/CollectionOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test Case for {@link CollectionOf}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.23
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/collection/FilteredTest.java b/src/test/java/org/cactoos/collection/FilteredTest.java
index 050e003f31..012238058b 100644
--- a/src/test/java/org/cactoos/collection/FilteredTest.java
+++ b/src/test/java/org/cactoos/collection/FilteredTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link org.cactoos.collection.Filtered}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 line)
diff --git a/src/test/java/org/cactoos/collection/HeadOfTest.java b/src/test/java/org/cactoos/collection/HeadOfTest.java
index 48096e4ff8..d9cf93b0f9 100644
--- a/src/test/java/org/cactoos/collection/HeadOfTest.java
+++ b/src/test/java/org/cactoos/collection/HeadOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test Case for {@link HeadOf}.
- * @author Alexander Menshikov (sharplermc@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/collection/JoinedTest.java b/src/test/java/org/cactoos/collection/JoinedTest.java
index 70cc021b55..b34f75e56d 100644
--- a/src/test/java/org/cactoos/collection/JoinedTest.java
+++ b/src/test/java/org/cactoos/collection/JoinedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link Limited}.
  *
- * @author Mykola Yashchenko (vkont4@gmail.com)
- * @version $Id$
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 line)
diff --git a/src/test/java/org/cactoos/collection/MappedTest.java b/src/test/java/org/cactoos/collection/MappedTest.java
index fc2ebbf80a..81b9f54c50 100644
--- a/src/test/java/org/cactoos/collection/MappedTest.java
+++ b/src/test/java/org/cactoos/collection/MappedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
 
 /**
  * Test case for {@link Mapped}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/collection/ReversedTest.java b/src/test/java/org/cactoos/collection/ReversedTest.java
index 93997d1f19..1f2e374aab 100644
--- a/src/test/java/org/cactoos/collection/ReversedTest.java
+++ b/src/test/java/org/cactoos/collection/ReversedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link org.cactoos.collection.Reversed}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 line)
diff --git a/src/test/java/org/cactoos/collection/ShuffledTest.java b/src/test/java/org/cactoos/collection/ShuffledTest.java
index faad33bb31..b308f40455 100644
--- a/src/test/java/org/cactoos/collection/ShuffledTest.java
+++ b/src/test/java/org/cactoos/collection/ShuffledTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test Case for {@link Shuffled}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.23
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/collection/SolidCollectionTest.java b/src/test/java/org/cactoos/collection/SolidCollectionTest.java
index 1d949a1ec5..27d0263231 100644
--- a/src/test/java/org/cactoos/collection/SolidCollectionTest.java
+++ b/src/test/java/org/cactoos/collection/SolidCollectionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 
 /**
  * Test Case for {@link SolidCollection}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/collection/SortedTest.java b/src/test/java/org/cactoos/collection/SortedTest.java
index 1ef15a71fc..005e507a65 100644
--- a/src/test/java/org/cactoos/collection/SortedTest.java
+++ b/src/test/java/org/cactoos/collection/SortedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test Case for {@link Sorted}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.19
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/collection/StickyCollectionTest.java b/src/test/java/org/cactoos/collection/StickyCollectionTest.java
index 27900022ac..666a90e519 100644
--- a/src/test/java/org/cactoos/collection/StickyCollectionTest.java
+++ b/src/test/java/org/cactoos/collection/StickyCollectionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 
 /**
  * Test case for {@link StickyCollection}.
- * @author Mykola Yashchenko (vkont4@gmail.com)
- * @version $Id$
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/collection/SyncCollectionTest.java b/src/test/java/org/cactoos/collection/SyncCollectionTest.java
index 61032113b5..e6750eb937 100644
--- a/src/test/java/org/cactoos/collection/SyncCollectionTest.java
+++ b/src/test/java/org/cactoos/collection/SyncCollectionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test Case for {@link SyncCollection}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.23
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/collection/TailOfTest.java b/src/test/java/org/cactoos/collection/TailOfTest.java
index 733c562bce..37fae826ab 100644
--- a/src/test/java/org/cactoos/collection/TailOfTest.java
+++ b/src/test/java/org/cactoos/collection/TailOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link TailOf}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/collection/package-info.java b/src/test/java/org/cactoos/collection/package-info.java
index 120890ace8..4469156b46 100644
--- a/src/test/java/org/cactoos/collection/package-info.java
+++ b/src/test/java/org/cactoos/collection/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Collections, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  */
 package org.cactoos.collection;
diff --git a/src/test/java/org/cactoos/func/AsyncFuncTest.java b/src/test/java/org/cactoos/func/AsyncFuncTest.java
index 8d4b2213f7..47f932ef79 100644
--- a/src/test/java/org/cactoos/func/AsyncFuncTest.java
+++ b/src/test/java/org/cactoos/func/AsyncFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
 /**
  * Test case for {@link AsyncFunc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.10
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/BiFuncOfTest.java b/src/test/java/org/cactoos/func/BiFuncOfTest.java
index 058210c027..e2f37265b1 100644
--- a/src/test/java/org/cactoos/func/BiFuncOfTest.java
+++ b/src/test/java/org/cactoos/func/BiFuncOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link BiFuncOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.20
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/CallableOfTest.java b/src/test/java/org/cactoos/func/CallableOfTest.java
index f1b51d5755..da1c412ee5 100644
--- a/src/test/java/org/cactoos/func/CallableOfTest.java
+++ b/src/test/java/org/cactoos/func/CallableOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link CallableOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
@@ -52,7 +50,7 @@ public void convertsFuncIntoCallable() throws Exception {
     public void convertsRunnableIntoCallable() throws Exception {
         final AtomicBoolean flag = new AtomicBoolean(false);
         new CallableOf<>(
-            () -> { flag.set(true); }
+            () -> flag.set(true)
         ).call();
         MatcherAssert.assertThat(
             flag.get(),
@@ -63,7 +61,9 @@ public void convertsRunnableIntoCallable() throws Exception {
     @Test(expected = Exception.class)
     public void wrapsRuntimeErrorFromRunnable() throws Exception {
         new CallableOf<>(
-            () -> { throw new IllegalStateException(); }
+            () -> {
+                throw new IllegalStateException();
+            }
         ).call();
     }
 
@@ -71,7 +71,9 @@ public void wrapsRuntimeErrorFromRunnable() throws Exception {
     public void convertsProcIntoCallable() throws Exception {
         final AtomicBoolean flag = new AtomicBoolean(false);
         new CallableOf<>(
-            unused -> { flag.set(true); }
+            unused -> {
+                flag.set(true);
+            }
         ).call();
         MatcherAssert.assertThat(
             flag.get(),
diff --git a/src/test/java/org/cactoos/func/ChainedFuncTest.java b/src/test/java/org/cactoos/func/ChainedFuncTest.java
index 3e3cee5ce0..3f3ddc2708 100644
--- a/src/test/java/org/cactoos/func/ChainedFuncTest.java
+++ b/src/test/java/org/cactoos/func/ChainedFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 /**
  * Test case for {@link ChainedFunc}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.7
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 line)
diff --git a/src/test/java/org/cactoos/func/FuncOfTest.java b/src/test/java/org/cactoos/func/FuncOfTest.java
index 2f95852a9f..26429f2eab 100644
--- a/src/test/java/org/cactoos/func/FuncOfTest.java
+++ b/src/test/java/org/cactoos/func/FuncOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link FuncOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.20
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/FuncWithFallbackTest.java b/src/test/java/org/cactoos/func/FuncWithFallbackTest.java
index 7e0aafabf2..6eab4206d8 100644
--- a/src/test/java/org/cactoos/func/FuncWithFallbackTest.java
+++ b/src/test/java/org/cactoos/func/FuncWithFallbackTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link FuncWithFallback}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/IoCheckedBiFuncTest.java b/src/test/java/org/cactoos/func/IoCheckedBiFuncTest.java
index 0710f67c43..9ef9e54a76 100644
--- a/src/test/java/org/cactoos/func/IoCheckedBiFuncTest.java
+++ b/src/test/java/org/cactoos/func/IoCheckedBiFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test case for {@link IoCheckedBiFunc}.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/IoCheckedFuncTest.java b/src/test/java/org/cactoos/func/IoCheckedFuncTest.java
index 2a08a5a696..990eef20f4 100644
--- a/src/test/java/org/cactoos/func/IoCheckedFuncTest.java
+++ b/src/test/java/org/cactoos/func/IoCheckedFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link IoCheckedFunc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.4
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/IoCheckedProcTest.java b/src/test/java/org/cactoos/func/IoCheckedProcTest.java
index bc2f73be1d..2c8254cfa9 100644
--- a/src/test/java/org/cactoos/func/IoCheckedProcTest.java
+++ b/src/test/java/org/cactoos/func/IoCheckedProcTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link IoCheckedProc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.4
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/ProcOfTest.java b/src/test/java/org/cactoos/func/ProcOfTest.java
index a9d25128e4..3b9f5b7c56 100644
--- a/src/test/java/org/cactoos/func/ProcOfTest.java
+++ b/src/test/java/org/cactoos/func/ProcOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link ProcOf}.
  *
- * @author Mikhail Yakushin (driver733@me.com)
- * @version $Id$
  * @since 0.3
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/RepeatedFuncTest.java b/src/test/java/org/cactoos/func/RepeatedFuncTest.java
index 27cf4bbcc9..2789a45b8e 100644
--- a/src/test/java/org/cactoos/func/RepeatedFuncTest.java
+++ b/src/test/java/org/cactoos/func/RepeatedFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link RepeatedFunc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 line)
diff --git a/src/test/java/org/cactoos/func/RetryFuncTest.java b/src/test/java/org/cactoos/func/RetryFuncTest.java
index 6d7a47a2ce..3b572884c9 100644
--- a/src/test/java/org/cactoos/func/RetryFuncTest.java
+++ b/src/test/java/org/cactoos/func/RetryFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link RetryFunc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 line)
diff --git a/src/test/java/org/cactoos/func/RunnableOfTest.java b/src/test/java/org/cactoos/func/RunnableOfTest.java
index 6f852efde5..9a62697d52 100644
--- a/src/test/java/org/cactoos/func/RunnableOfTest.java
+++ b/src/test/java/org/cactoos/func/RunnableOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,9 +31,6 @@
 /**
  * Test case for {@link RunnableOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Stanislav Myachenkov (s.myachenkov@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/SolidBiFuncTest.java b/src/test/java/org/cactoos/func/SolidBiFuncTest.java
index 991cb3c5e9..1b55edfbd4 100644
--- a/src/test/java/org/cactoos/func/SolidBiFuncTest.java
+++ b/src/test/java/org/cactoos/func/SolidBiFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link SolidBiFunc}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/SolidFuncTest.java b/src/test/java/org/cactoos/func/SolidFuncTest.java
index 73bc73afca..c3fed5a80e 100644
--- a/src/test/java/org/cactoos/func/SolidFuncTest.java
+++ b/src/test/java/org/cactoos/func/SolidFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link SolidFunc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/StickyBiFuncTest.java b/src/test/java/org/cactoos/func/StickyBiFuncTest.java
index 01b5c086de..692602d0c9 100644
--- a/src/test/java/org/cactoos/func/StickyBiFuncTest.java
+++ b/src/test/java/org/cactoos/func/StickyBiFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for {@link StickyBiFunc}.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/StickyFuncTest.java b/src/test/java/org/cactoos/func/StickyFuncTest.java
index 7f6224ef58..25d7a08b1f 100644
--- a/src/test/java/org/cactoos/func/StickyFuncTest.java
+++ b/src/test/java/org/cactoos/func/StickyFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link StickyFunc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.4
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/SyncFuncTest.java b/src/test/java/org/cactoos/func/SyncFuncTest.java
index d786956b4d..09f8af7ca2 100644
--- a/src/test/java/org/cactoos/func/SyncFuncTest.java
+++ b/src/test/java/org/cactoos/func/SyncFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link SyncFunc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/TimedFuncTest.java b/src/test/java/org/cactoos/func/TimedFuncTest.java
index 82e71ecff7..d2eb9828f6 100644
--- a/src/test/java/org/cactoos/func/TimedFuncTest.java
+++ b/src/test/java/org/cactoos/func/TimedFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 
 /**
  * Test case for {@link TimedFunc}.
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 0.29.3
  * @checkstyle JavadocMethodCheck (500 lines)
  */
@@ -84,7 +82,7 @@ public void futureTaskIsCancelled() {
                 period,
                 input -> future
             ).apply(true);
-                // @checkstyle IllegalCatchCheck (1 line)
+            // @checkstyle IllegalCatchCheck (1 line)
         } catch (final Exception exp) {
             MatcherAssert.assertThat(
                 future.isCancelled(),
@@ -105,3 +103,4 @@ public void functionIsExecuted() throws Exception {
         );
     }
 }
+
diff --git a/src/test/java/org/cactoos/func/UncheckedBiFuncTest.java b/src/test/java/org/cactoos/func/UncheckedBiFuncTest.java
index 304398f9a9..956ba7a7a5 100644
--- a/src/test/java/org/cactoos/func/UncheckedBiFuncTest.java
+++ b/src/test/java/org/cactoos/func/UncheckedBiFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for {@link UncheckedBiFunc}.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/UncheckedFuncTest.java b/src/test/java/org/cactoos/func/UncheckedFuncTest.java
index d1376c6a2b..55723ad3f6 100644
--- a/src/test/java/org/cactoos/func/UncheckedFuncTest.java
+++ b/src/test/java/org/cactoos/func/UncheckedFuncTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link UncheckedFunc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/UncheckedProcTest.java b/src/test/java/org/cactoos/func/UncheckedProcTest.java
index 11481872b4..8182225b05 100644
--- a/src/test/java/org/cactoos/func/UncheckedProcTest.java
+++ b/src/test/java/org/cactoos/func/UncheckedProcTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link UncheckedProc}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/func/package-info.java b/src/test/java/org/cactoos/func/package-info.java
index bb45371728..9a90c48568 100644
--- a/src/test/java/org/cactoos/func/package-info.java
+++ b/src/test/java/org/cactoos/func/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Functions and procedures, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.2
  */
 package org.cactoos.func;
diff --git a/src/test/java/org/cactoos/io/BytesOfTest.java b/src/test/java/org/cactoos/io/BytesOfTest.java
index 751cb5246d..6123de1471 100644
--- a/src/test/java/org/cactoos/io/BytesOfTest.java
+++ b/src/test/java/org/cactoos/io/BytesOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -43,10 +43,6 @@
 /**
  * Test case for {@link BytesOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/CheckedBytesTest.java b/src/test/java/org/cactoos/io/CheckedBytesTest.java
index f2bb2046b5..9c3c749025 100644
--- a/src/test/java/org/cactoos/io/CheckedBytesTest.java
+++ b/src/test/java/org/cactoos/io/CheckedBytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link CheckedBytes}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/CheckedInputTest.java b/src/test/java/org/cactoos/io/CheckedInputTest.java
index d805191dba..9cd521ecf8 100644
--- a/src/test/java/org/cactoos/io/CheckedInputTest.java
+++ b/src/test/java/org/cactoos/io/CheckedInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link CheckedInput}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/CheckedOutputTest.java b/src/test/java/org/cactoos/io/CheckedOutputTest.java
index 0ae060fc15..29a0fbd21d 100644
--- a/src/test/java/org/cactoos/io/CheckedOutputTest.java
+++ b/src/test/java/org/cactoos/io/CheckedOutputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link CheckedOutput}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/DeadInputTest.java b/src/test/java/org/cactoos/io/DeadInputTest.java
index 9aafa6cac8..83665e9b6d 100644
--- a/src/test/java/org/cactoos/io/DeadInputTest.java
+++ b/src/test/java/org/cactoos/io/DeadInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link DeadInput}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/DeadOutputTest.java b/src/test/java/org/cactoos/io/DeadOutputTest.java
index f2a3133c21..64303fb2c0 100644
--- a/src/test/java/org/cactoos/io/DeadOutputTest.java
+++ b/src/test/java/org/cactoos/io/DeadOutputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link DeadOutput}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/DirectoryTest.java b/src/test/java/org/cactoos/io/DirectoryTest.java
index 23211ae2b6..9a9d274544 100644
--- a/src/test/java/org/cactoos/io/DirectoryTest.java
+++ b/src/test/java/org/cactoos/io/DirectoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 
 /**
  * Test case for {@link Directory}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/EmptyClosableReader.java b/src/test/java/org/cactoos/io/EmptyClosableReader.java
index e6695c0d65..681151754f 100644
--- a/src/test/java/org/cactoos/io/EmptyClosableReader.java
+++ b/src/test/java/org/cactoos/io/EmptyClosableReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Alexey Kutepov (reximkut@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 final class EmptyClosableReader extends Reader {
diff --git a/src/test/java/org/cactoos/io/FakeHandler.java b/src/test/java/org/cactoos/io/FakeHandler.java
index bbb4e36f59..d9b6f53782 100644
--- a/src/test/java/org/cactoos/io/FakeHandler.java
+++ b/src/test/java/org/cactoos/io/FakeHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 public final class FakeHandler extends Handler {
diff --git a/src/test/java/org/cactoos/io/FakeLogger.java b/src/test/java/org/cactoos/io/FakeLogger.java
index ef9d8d4a5d..916a3940ab 100644
--- a/src/test/java/org/cactoos/io/FakeLogger.java
+++ b/src/test/java/org/cactoos/io/FakeLogger.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  */
 @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
diff --git a/src/test/java/org/cactoos/io/GzipInputTest.java b/src/test/java/org/cactoos/io/GzipInputTest.java
index d4406e54c0..203c1279e3 100644
--- a/src/test/java/org/cactoos/io/GzipInputTest.java
+++ b/src/test/java/org/cactoos/io/GzipInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 
 /**
  * Test case for {@link org.cactoos.io.GzipInput}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/GzipOutputTest.java b/src/test/java/org/cactoos/io/GzipOutputTest.java
index 54be0cd2ea..c308429475 100644
--- a/src/test/java/org/cactoos/io/GzipOutputTest.java
+++ b/src/test/java/org/cactoos/io/GzipOutputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,8 +37,6 @@
 
 /**
  * Test case for {@link org.cactoos.io.GzipOutput}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/HeadInputStreamTest.java b/src/test/java/org/cactoos/io/HeadInputStreamTest.java
index f7b2829063..5eaa4647a7 100644
--- a/src/test/java/org/cactoos/io/HeadInputStreamTest.java
+++ b/src/test/java/org/cactoos/io/HeadInputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test cases for {@link HeadInputStream}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/HeadInputTest.java b/src/test/java/org/cactoos/io/HeadInputTest.java
index 1f3574333f..fc89ab117b 100644
--- a/src/test/java/org/cactoos/io/HeadInputTest.java
+++ b/src/test/java/org/cactoos/io/HeadInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test cases for {@link HeadInput}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/InputAsBytesTest.java b/src/test/java/org/cactoos/io/InputAsBytesTest.java
index 15283616f5..d6776446ae 100644
--- a/src/test/java/org/cactoos/io/InputAsBytesTest.java
+++ b/src/test/java/org/cactoos/io/InputAsBytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link InputAsBytes}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/InputOfTest.java b/src/test/java/org/cactoos/io/InputOfTest.java
index e7407528af..3e18b194a2 100644
--- a/src/test/java/org/cactoos/io/InputOfTest.java
+++ b/src/test/java/org/cactoos/io/InputOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -54,10 +54,6 @@
 /**
  * Test case for {@link InputOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Kirill (g4s8.public@gmail.com)
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/InputStreamOfTest.java b/src/test/java/org/cactoos/io/InputStreamOfTest.java
index 955cf8775b..f8d40f28be 100644
--- a/src/test/java/org/cactoos/io/InputStreamOfTest.java
+++ b/src/test/java/org/cactoos/io/InputStreamOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
 /**
  * Test case for {@link InputStreamOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/InputWithFallbackTest.java b/src/test/java/org/cactoos/io/InputWithFallbackTest.java
index edc88d81e8..38373a0d59 100644
--- a/src/test/java/org/cactoos/io/InputWithFallbackTest.java
+++ b/src/test/java/org/cactoos/io/InputWithFallbackTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link InputWithFallback}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/LSInputOfTest.java b/src/test/java/org/cactoos/io/LSInputOfTest.java
index e87ccf2fde..9721d2110c 100644
--- a/src/test/java/org/cactoos/io/LSInputOfTest.java
+++ b/src/test/java/org/cactoos/io/LSInputOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link LSInputOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle AbbreviationAsWordInNameCheck (5 lines)
diff --git a/src/test/java/org/cactoos/io/LengthOfTest.java b/src/test/java/org/cactoos/io/LengthOfTest.java
index 0da9037fc5..6797af924f 100644
--- a/src/test/java/org/cactoos/io/LengthOfTest.java
+++ b/src/test/java/org/cactoos/io/LengthOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link LengthOf}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 line)
diff --git a/src/test/java/org/cactoos/io/LoggingInputTest.java b/src/test/java/org/cactoos/io/LoggingInputTest.java
index aaeb79d457..39e54ca9fb 100644
--- a/src/test/java/org/cactoos/io/LoggingInputTest.java
+++ b/src/test/java/org/cactoos/io/LoggingInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link LoggingInput}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/LoggingOutputTest.java b/src/test/java/org/cactoos/io/LoggingOutputTest.java
index e595afe9bc..5b83e2e4be 100644
--- a/src/test/java/org/cactoos/io/LoggingOutputTest.java
+++ b/src/test/java/org/cactoos/io/LoggingOutputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
 /**
  * Test case for {@link LoggingOutput}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/Md5DigestOfTest.java b/src/test/java/org/cactoos/io/Md5DigestOfTest.java
index 9344a566ce..9493238910 100644
--- a/src/test/java/org/cactoos/io/Md5DigestOfTest.java
+++ b/src/test/java/org/cactoos/io/Md5DigestOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link Md5DigestOf}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/OutputStreamToTest.java b/src/test/java/org/cactoos/io/OutputStreamToTest.java
index b022745a50..716e8d04cb 100644
--- a/src/test/java/org/cactoos/io/OutputStreamToTest.java
+++ b/src/test/java/org/cactoos/io/OutputStreamToTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link OutputStreamTo}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/OutputToTest.java b/src/test/java/org/cactoos/io/OutputToTest.java
index 74e1c2cfb7..2e2dae22d3 100644
--- a/src/test/java/org/cactoos/io/OutputToTest.java
+++ b/src/test/java/org/cactoos/io/OutputToTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,9 +36,6 @@
 /**
  * Test case for {@link OutputTo}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.15
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/ReaderAsBytesTest.java b/src/test/java/org/cactoos/io/ReaderAsBytesTest.java
index 011be15747..287b85013c 100644
--- a/src/test/java/org/cactoos/io/ReaderAsBytesTest.java
+++ b/src/test/java/org/cactoos/io/ReaderAsBytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,8 +37,6 @@
 /**
  * Test case for {@link ReaderAsBytes}.
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/ReaderOfTest.java b/src/test/java/org/cactoos/io/ReaderOfTest.java
index 0f338efb1e..0a672d0ad6 100644
--- a/src/test/java/org/cactoos/io/ReaderOfTest.java
+++ b/src/test/java/org/cactoos/io/ReaderOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,9 +37,6 @@
 
 /**
  * Test case for {@link ReaderOf}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/ResourceOfTest.java b/src/test/java/org/cactoos/io/ResourceOfTest.java
index 15eefd0763..20b589cae0 100644
--- a/src/test/java/org/cactoos/io/ResourceOfTest.java
+++ b/src/test/java/org/cactoos/io/ResourceOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link ResourceOf}.
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/Sha1DigestOfTest.java b/src/test/java/org/cactoos/io/Sha1DigestOfTest.java
index fc776fdf4d..9f697a4add 100644
--- a/src/test/java/org/cactoos/io/Sha1DigestOfTest.java
+++ b/src/test/java/org/cactoos/io/Sha1DigestOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link Sha1DigestOf}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/Sha256DigestOfTest.java b/src/test/java/org/cactoos/io/Sha256DigestOfTest.java
index 047d5d7e17..732f81d10f 100644
--- a/src/test/java/org/cactoos/io/Sha256DigestOfTest.java
+++ b/src/test/java/org/cactoos/io/Sha256DigestOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link Sha256DigestOf}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/SlowInput.java b/src/test/java/org/cactoos/io/SlowInput.java
index 599992e3fe..19c7bcf29f 100644
--- a/src/test/java/org/cactoos/io/SlowInput.java
+++ b/src/test/java/org/cactoos/io/SlowInput.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Input that returns content in small portions.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 final class SlowInput implements Input {
diff --git a/src/test/java/org/cactoos/io/SlowInputStream.java b/src/test/java/org/cactoos/io/SlowInputStream.java
index ddd4d4de21..f4ecf61a48 100644
--- a/src/test/java/org/cactoos/io/SlowInputStream.java
+++ b/src/test/java/org/cactoos/io/SlowInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * InputStream that returns content in small portions.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 final class SlowInputStream extends InputStream {
diff --git a/src/test/java/org/cactoos/io/SlowInputTest.java b/src/test/java/org/cactoos/io/SlowInputTest.java
index e3957cf277..f5330dd448 100644
--- a/src/test/java/org/cactoos/io/SlowInputTest.java
+++ b/src/test/java/org/cactoos/io/SlowInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,9 +32,6 @@
 /**
  * Test case for {@link SlowInput}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/StickyInputTest.java b/src/test/java/org/cactoos/io/StickyInputTest.java
index 7f885f7d54..988bf5f944 100644
--- a/src/test/java/org/cactoos/io/StickyInputTest.java
+++ b/src/test/java/org/cactoos/io/StickyInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,8 +37,6 @@
 
 /**
  * Test case for {@link StickyInput}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.6
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/TailInputTest.java b/src/test/java/org/cactoos/io/TailInputTest.java
index 10a22b3c39..2e863a20ae 100644
--- a/src/test/java/org/cactoos/io/TailInputTest.java
+++ b/src/test/java/org/cactoos/io/TailInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Tests for {@link TailInput}.
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/TeeInputFromByteArrayTest.java b/src/test/java/org/cactoos/io/TeeInputFromByteArrayTest.java
index 869acc693c..07365be2f5 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromByteArrayTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromByteArrayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use byte array as an
  * input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (100 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (100 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromBytesTest.java b/src/test/java/org/cactoos/io/TeeInputFromBytesTest.java
index f1cba2e601..e30ba6c267 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromBytesTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromBytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use
  * {@link org.cactoos.Bytes} as an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (100 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (100 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromCharArrayTest.java b/src/test/java/org/cactoos/io/TeeInputFromCharArrayTest.java
index 3da56cb1f1..ef5d2121a7 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromCharArrayTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromCharArrayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use char array as an
  * input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (215 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (215 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromCharSequenceTest.java b/src/test/java/org/cactoos/io/TeeInputFromCharSequenceTest.java
index 31539c584a..a4ac33e6e9 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromCharSequenceTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromCharSequenceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use char sequence as
  * an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (215 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (215 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromFileTest.java b/src/test/java/org/cactoos/io/TeeInputFromFileTest.java
index 72e3b3da0c..d6a2faff76 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromFileTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromFileTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use file as an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (120 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (120 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromInputTest.java b/src/test/java/org/cactoos/io/TeeInputFromInputTest.java
index 9a719324d1..b2b0c193f3 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromInputTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromInputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use
  * {@link org.cactoos.Input} as an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (200 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (200 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromPathTest.java b/src/test/java/org/cactoos/io/TeeInputFromPathTest.java
index e3716877fb..0a98a4fc2a 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromPathTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromPathTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use {@link Path} as
  * an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (120 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (120 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromReaderTest.java b/src/test/java/org/cactoos/io/TeeInputFromReaderTest.java
index 946048c629..ab008211a5 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromReaderTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use
  * {@link java.io.Reader} as an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (400 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (400 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromTextTest.java b/src/test/java/org/cactoos/io/TeeInputFromTextTest.java
index 6041cac91e..480021ecd2 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromTextTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use
  * {@link org.cactoos.Text} as an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (215 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (215 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromUriTest.java b/src/test/java/org/cactoos/io/TeeInputFromUriTest.java
index 8062fc318b..2911ab8365 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromUriTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromUriTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,8 +37,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use
  * {@link java.net.URI} as an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (120 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (120 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputFromUrlTest.java b/src/test/java/org/cactoos/io/TeeInputFromUrlTest.java
index 953154a1db..b408c91128 100644
--- a/src/test/java/org/cactoos/io/TeeInputFromUrlTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputFromUrlTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,8 +37,6 @@
 /**
  * Test case for {@link TeeInput}. Cases for ctors which use
  * {@link java.net.URL} as an input.
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (125 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (125 lines)
diff --git a/src/test/java/org/cactoos/io/TeeInputStreamTest.java b/src/test/java/org/cactoos/io/TeeInputStreamTest.java
index 788b5c741a..100709ef2e 100644
--- a/src/test/java/org/cactoos/io/TeeInputStreamTest.java
+++ b/src/test/java/org/cactoos/io/TeeInputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,9 +37,6 @@
 
 /**
  * Test case for {@link TeeInputStream}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Stanislav Myachenkov (s.myachenkov@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/TeeOutputStreamTest.java b/src/test/java/org/cactoos/io/TeeOutputStreamTest.java
index 721cbf848e..725564be40 100644
--- a/src/test/java/org/cactoos/io/TeeOutputStreamTest.java
+++ b/src/test/java/org/cactoos/io/TeeOutputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,9 +34,6 @@
 
 /**
  * Test case for {@link TeeOutputStream}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Stanislav Myachenkov (s.myachenkov@gmail.com)
- * @version $Id$
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/TeeOutputTest.java b/src/test/java/org/cactoos/io/TeeOutputTest.java
index ce807c4daa..d5689c5177 100644
--- a/src/test/java/org/cactoos/io/TeeOutputTest.java
+++ b/src/test/java/org/cactoos/io/TeeOutputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 
 /**
  * Test case for {@link TeeOutput}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/TeeReaderTest.java b/src/test/java/org/cactoos/io/TeeReaderTest.java
index dafeefc272..ad7dd03066 100644
--- a/src/test/java/org/cactoos/io/TeeReaderTest.java
+++ b/src/test/java/org/cactoos/io/TeeReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link TeeReader}.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/TempFileTest.java b/src/test/java/org/cactoos/io/TempFileTest.java
index 26dc277388..6bc1455716 100644
--- a/src/test/java/org/cactoos/io/TempFileTest.java
+++ b/src/test/java/org/cactoos/io/TempFileTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Unit tests for {@link TempFile}.
  *
- * @author George Aristy (george.aristy@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/UncheckedBytesTest.java b/src/test/java/org/cactoos/io/UncheckedBytesTest.java
index c56cc8e758..964c224495 100644
--- a/src/test/java/org/cactoos/io/UncheckedBytesTest.java
+++ b/src/test/java/org/cactoos/io/UncheckedBytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Test case for {@link UncheckedBytes}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.3
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/UncheckedOutputTest.java b/src/test/java/org/cactoos/io/UncheckedOutputTest.java
index 51441c1fb0..29c9e2ba2e 100644
--- a/src/test/java/org/cactoos/io/UncheckedOutputTest.java
+++ b/src/test/java/org/cactoos/io/UncheckedOutputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Test case for {@link UncheckedOutput}.
  *
- * @author Alexey Semenyuk (semenyukalexey88@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/WriterAsOutputStreamTest.java b/src/test/java/org/cactoos/io/WriterAsOutputStreamTest.java
index c5f547a783..27e5af51ad 100644
--- a/src/test/java/org/cactoos/io/WriterAsOutputStreamTest.java
+++ b/src/test/java/org/cactoos/io/WriterAsOutputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -42,8 +42,6 @@
 /**
  * Test case for {@link WriterAsOutputStream}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/WriterAsOutputTest.java b/src/test/java/org/cactoos/io/WriterAsOutputTest.java
index 6b0a52993c..de9e1c35e4 100644
--- a/src/test/java/org/cactoos/io/WriterAsOutputTest.java
+++ b/src/test/java/org/cactoos/io/WriterAsOutputTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
 /**
  * Test case for {@link WriterAsOutput}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/WriterToTest.java b/src/test/java/org/cactoos/io/WriterToTest.java
index 3441a3f38e..4704c15ee4 100644
--- a/src/test/java/org/cactoos/io/WriterToTest.java
+++ b/src/test/java/org/cactoos/io/WriterToTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link WriterTo}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.13
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/io/ZipTest.java b/src/test/java/org/cactoos/io/ZipTest.java
index 320b2c75db..8653dd6afd 100644
--- a/src/test/java/org/cactoos/io/ZipTest.java
+++ b/src/test/java/org/cactoos/io/ZipTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
 /**
  * Test case for {@link Zip}.
  *
- * @author Alexander Menshikov (sharplermc@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/io/package-info.java b/src/test/java/org/cactoos/io/package-info.java
index 4aa57251e8..971ec30d8e 100644
--- a/src/test/java/org/cactoos/io/package-info.java
+++ b/src/test/java/org/cactoos/io/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Input/Output, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 package org.cactoos.io;
diff --git a/src/test/java/org/cactoos/iterable/CycledTest.java b/src/test/java/org/cactoos/iterable/CycledTest.java
index 683702b249..2ca5e30798 100644
--- a/src/test/java/org/cactoos/iterable/CycledTest.java
+++ b/src/test/java/org/cactoos/iterable/CycledTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Test Case for {@link Cycled}.
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/EndlessTest.java b/src/test/java/org/cactoos/iterable/EndlessTest.java
index 2ab387d091..f613d7da35 100644
--- a/src/test/java/org/cactoos/iterable/EndlessTest.java
+++ b/src/test/java/org/cactoos/iterable/EndlessTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test Case for {@link Endless}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/FilteredTest.java b/src/test/java/org/cactoos/iterable/FilteredTest.java
index c5a2064641..dcda8501da 100644
--- a/src/test/java/org/cactoos/iterable/FilteredTest.java
+++ b/src/test/java/org/cactoos/iterable/FilteredTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link Filtered}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/HeadOfTest.java b/src/test/java/org/cactoos/iterable/HeadOfTest.java
index eab887254c..c43d7acf09 100644
--- a/src/test/java/org/cactoos/iterable/HeadOfTest.java
+++ b/src/test/java/org/cactoos/iterable/HeadOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test Case for {@link HeadOf}.
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfBooleansTest.java b/src/test/java/org/cactoos/iterable/IterableOfBooleansTest.java
index dea1a8de71..f8acd8918a 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfBooleansTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfBooleansTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link IterableOfBooleans}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfBytesTest.java b/src/test/java/org/cactoos/iterable/IterableOfBytesTest.java
index f0c357e0c9..df6f1271a3 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfBytesTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfBytesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link IterableOfBytes}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfCharsTest.java b/src/test/java/org/cactoos/iterable/IterableOfCharsTest.java
index 28ad691b88..3760628e8d 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfCharsTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfCharsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link IterableOfChars}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfDoublesTest.java b/src/test/java/org/cactoos/iterable/IterableOfDoublesTest.java
index 2d43b06b68..63d2ab743a 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfDoublesTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfDoublesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link IterableOfDoubles}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfFloatsTest.java b/src/test/java/org/cactoos/iterable/IterableOfFloatsTest.java
index a6be75e060..df8cb504bd 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfFloatsTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfFloatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link IterableOfFloats}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfIntsTest.java b/src/test/java/org/cactoos/iterable/IterableOfIntsTest.java
index 63fe395b3e..ff3687040b 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfIntsTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfIntsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link IterableOfInts}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfLongsTest.java b/src/test/java/org/cactoos/iterable/IterableOfLongsTest.java
index 5c99409784..a1fa8e1ed0 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfLongsTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfLongsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link IterableOfLongs}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfShortsTest.java b/src/test/java/org/cactoos/iterable/IterableOfShortsTest.java
index 646787a534..87b9dd364f 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfShortsTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfShortsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link IterableOfShorts}.
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/IterableOfTest.java b/src/test/java/org/cactoos/iterable/IterableOfTest.java
index 3417c3485c..5abb88aa80 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,9 +30,6 @@
 
 /**
  * Test case for {@link IterableOf}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/JoinedTest.java b/src/test/java/org/cactoos/iterable/JoinedTest.java
index 5dcc9c2fc4..5c4e2f33f3 100644
--- a/src/test/java/org/cactoos/iterable/JoinedTest.java
+++ b/src/test/java/org/cactoos/iterable/JoinedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test case for {@link Joined}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/LengthOfTest.java b/src/test/java/org/cactoos/iterable/LengthOfTest.java
index cc99740709..bbdc886688 100644
--- a/src/test/java/org/cactoos/iterable/LengthOfTest.java
+++ b/src/test/java/org/cactoos/iterable/LengthOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link LengthOf}.
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/MappedTest.java b/src/test/java/org/cactoos/iterable/MappedTest.java
index 82fc7330cb..b70fc95d52 100644
--- a/src/test/java/org/cactoos/iterable/MappedTest.java
+++ b/src/test/java/org/cactoos/iterable/MappedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 
 /**
  * Test case for {@link Mapped}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/PartitionedTest.java b/src/test/java/org/cactoos/iterable/PartitionedTest.java
index a682d77a8b..5170d8d2b8 100644
--- a/src/test/java/org/cactoos/iterable/PartitionedTest.java
+++ b/src/test/java/org/cactoos/iterable/PartitionedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link Partitioned}.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/RangeOfTest.java b/src/test/java/org/cactoos/iterable/RangeOfTest.java
index b1b7b5bd90..a29580f341 100644
--- a/src/test/java/org/cactoos/iterable/RangeOfTest.java
+++ b/src/test/java/org/cactoos/iterable/RangeOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test of range implementation.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/RepeatedTest.java b/src/test/java/org/cactoos/iterable/RepeatedTest.java
index b8638aea45..a1e7b09491 100644
--- a/src/test/java/org/cactoos/iterable/RepeatedTest.java
+++ b/src/test/java/org/cactoos/iterable/RepeatedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link Repeated}.
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/ReversedTest.java b/src/test/java/org/cactoos/iterable/ReversedTest.java
index 86a97d44a0..8b43922f16 100644
--- a/src/test/java/org/cactoos/iterable/ReversedTest.java
+++ b/src/test/java/org/cactoos/iterable/ReversedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test case for {@link Reversed}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/ShuffledTest.java b/src/test/java/org/cactoos/iterable/ShuffledTest.java
index afebb3f494..a6b017c02f 100644
--- a/src/test/java/org/cactoos/iterable/ShuffledTest.java
+++ b/src/test/java/org/cactoos/iterable/ShuffledTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test Case for {@link Shuffled}.
  *
- * @author Ivan Shcherbak (alotofall@gmail.com)
- * @version $Id$
  * @since 0.20
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/SolidIterableTest.java b/src/test/java/org/cactoos/iterable/SolidIterableTest.java
index c2e0a33c85..8761fab1bb 100644
--- a/src/test/java/org/cactoos/iterable/SolidIterableTest.java
+++ b/src/test/java/org/cactoos/iterable/SolidIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test Case for {@link SolidIterable}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/SortedTest.java b/src/test/java/org/cactoos/iterable/SortedTest.java
index acc15ea3c4..93fd50aab2 100644
--- a/src/test/java/org/cactoos/iterable/SortedTest.java
+++ b/src/test/java/org/cactoos/iterable/SortedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link Sorted}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.7
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/StickyIterableTest.java b/src/test/java/org/cactoos/iterable/StickyIterableTest.java
index 7eb3c6a038..e58a3299fa 100644
--- a/src/test/java/org/cactoos/iterable/StickyIterableTest.java
+++ b/src/test/java/org/cactoos/iterable/StickyIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link StickyIterable}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterable/SyncIterableTest.java b/src/test/java/org/cactoos/iterable/SyncIterableTest.java
index 476388597e..b4b754ef39 100644
--- a/src/test/java/org/cactoos/iterable/SyncIterableTest.java
+++ b/src/test/java/org/cactoos/iterable/SyncIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test Case for {@link SyncIterable}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/TailOfTest.java b/src/test/java/org/cactoos/iterable/TailOfTest.java
index 20b11cbb14..6c268085b3 100644
--- a/src/test/java/org/cactoos/iterable/TailOfTest.java
+++ b/src/test/java/org/cactoos/iterable/TailOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link TailOf}.
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterable/package-info.java b/src/test/java/org/cactoos/iterable/package-info.java
index 064350beef..f66dd80330 100644
--- a/src/test/java/org/cactoos/iterable/package-info.java
+++ b/src/test/java/org/cactoos/iterable/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Iterables, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 package org.cactoos.iterable;
diff --git a/src/test/java/org/cactoos/iterator/CycledTest.java b/src/test/java/org/cactoos/iterator/CycledTest.java
index 21b000d93b..40f822194d 100644
--- a/src/test/java/org/cactoos/iterator/CycledTest.java
+++ b/src/test/java/org/cactoos/iterator/CycledTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 
 /**
  * Test Case for {@link Cycled}.
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/HeadOfTest.java b/src/test/java/org/cactoos/iterator/HeadOfTest.java
index f3babf3c6a..cc80c52840 100644
--- a/src/test/java/org/cactoos/iterator/HeadOfTest.java
+++ b/src/test/java/org/cactoos/iterator/HeadOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test Case for {@link HeadOf}.
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterator/IteratorOfBooleansTest.java b/src/test/java/org/cactoos/iterator/IteratorOfBooleansTest.java
index 484905d279..8396221e05 100644
--- a/src/test/java/org/cactoos/iterator/IteratorOfBooleansTest.java
+++ b/src/test/java/org/cactoos/iterator/IteratorOfBooleansTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.32
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java b/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java
index 6da4384fa8..acc8e7fa17 100644
--- a/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java
+++ b/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.32
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/IteratorOfFloatsTest.java b/src/test/java/org/cactoos/iterator/IteratorOfFloatsTest.java
index e354953b46..44ff118306 100644
--- a/src/test/java/org/cactoos/iterator/IteratorOfFloatsTest.java
+++ b/src/test/java/org/cactoos/iterator/IteratorOfFloatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.32
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/IteratorOfIntsTest.java b/src/test/java/org/cactoos/iterator/IteratorOfIntsTest.java
index 408183fdaf..0ea4f68425 100644
--- a/src/test/java/org/cactoos/iterator/IteratorOfIntsTest.java
+++ b/src/test/java/org/cactoos/iterator/IteratorOfIntsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Krzysztof Krason (Krzysztof.Krason@gmail.com)
- * @version $Id$
  * @since 0.32
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/IteratorOfTest.java b/src/test/java/org/cactoos/iterator/IteratorOfTest.java
index 37d0216e6b..c44529890e 100644
--- a/src/test/java/org/cactoos/iterator/IteratorOfTest.java
+++ b/src/test/java/org/cactoos/iterator/IteratorOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link IteratorOf}.
  *
- * @author Marat Reymers (marat.maratori@gmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/JoinedTest.java b/src/test/java/org/cactoos/iterator/JoinedTest.java
index b438ab02c9..a09e309d3c 100644
--- a/src/test/java/org/cactoos/iterator/JoinedTest.java
+++ b/src/test/java/org/cactoos/iterator/JoinedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for {@link Joined}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/LengthOfTest.java b/src/test/java/org/cactoos/iterator/LengthOfTest.java
index ca96fd4032..85426a6ed3 100644
--- a/src/test/java/org/cactoos/iterator/LengthOfTest.java
+++ b/src/test/java/org/cactoos/iterator/LengthOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test Case for {@link LengthOf}.
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 line)
diff --git a/src/test/java/org/cactoos/iterator/PartitionedTest.java b/src/test/java/org/cactoos/iterator/PartitionedTest.java
index 6eba9dba44..c43b6eb84a 100644
--- a/src/test/java/org/cactoos/iterator/PartitionedTest.java
+++ b/src/test/java/org/cactoos/iterator/PartitionedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link Partitioned}.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/iterator/RepeatedTest.java b/src/test/java/org/cactoos/iterator/RepeatedTest.java
index e7afa2d6fa..84b98263e9 100644
--- a/src/test/java/org/cactoos/iterator/RepeatedTest.java
+++ b/src/test/java/org/cactoos/iterator/RepeatedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link Repeated}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.4
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/ShuffledTest.java b/src/test/java/org/cactoos/iterator/ShuffledTest.java
index 908adb0a6a..a82dba861c 100644
--- a/src/test/java/org/cactoos/iterator/ShuffledTest.java
+++ b/src/test/java/org/cactoos/iterator/ShuffledTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test Case for {@link Shuffled}.
- * @author Ivan Shcherbak (alotofall@gmail.com)
- * @version $Id$
  * @since 0.20
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/SortedTest.java b/src/test/java/org/cactoos/iterator/SortedTest.java
index 158e1428a7..9eafc22f00 100644
--- a/src/test/java/org/cactoos/iterator/SortedTest.java
+++ b/src/test/java/org/cactoos/iterator/SortedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test Case for {@link Sorted}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.19
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/iterator/SyncIteratorTest.java b/src/test/java/org/cactoos/iterator/SyncIteratorTest.java
index ff6ae55f23..daa09c6953 100644
--- a/src/test/java/org/cactoos/iterator/SyncIteratorTest.java
+++ b/src/test/java/org/cactoos/iterator/SyncIteratorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test for {@link SyncIterator}.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterator/TailOfTest.java b/src/test/java/org/cactoos/iterator/TailOfTest.java
index ec648b1476..fec3631d3b 100644
--- a/src/test/java/org/cactoos/iterator/TailOfTest.java
+++ b/src/test/java/org/cactoos/iterator/TailOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for {@link TailOf}.
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/iterator/package-info.java b/src/test/java/org/cactoos/iterator/package-info.java
index d411264b13..52d0c13972 100644
--- a/src/test/java/org/cactoos/iterator/package-info.java
+++ b/src/test/java/org/cactoos/iterator/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Iterator, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 package org.cactoos.iterator;
diff --git a/src/test/java/org/cactoos/list/BehavesAsList.java b/src/test/java/org/cactoos/list/BehavesAsList.java
index 7fb63d0f2f..c85176ba55 100644
--- a/src/test/java/org/cactoos/list/BehavesAsList.java
+++ b/src/test/java/org/cactoos/list/BehavesAsList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Matcher for collection.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <E> Type of source item
  * @since 0.23
  * @checkstyle JavadocMethodCheck (500 lines)
diff --git a/src/test/java/org/cactoos/list/JoinedTest.java b/src/test/java/org/cactoos/list/JoinedTest.java
index eef0d66fae..7a4a11365b 100644
--- a/src/test/java/org/cactoos/list/JoinedTest.java
+++ b/src/test/java/org/cactoos/list/JoinedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link org.cactoos.collection.Joined}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.20
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 line)
diff --git a/src/test/java/org/cactoos/list/ListOfTest.java b/src/test/java/org/cactoos/list/ListOfTest.java
index 357e06e910..c89622435e 100644
--- a/src/test/java/org/cactoos/list/ListOfTest.java
+++ b/src/test/java/org/cactoos/list/ListOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 /**
  * Test case for {@link ListOf}.
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/list/MappedTest.java b/src/test/java/org/cactoos/list/MappedTest.java
index 5b8f6918e3..6e22329e6b 100644
--- a/src/test/java/org/cactoos/list/MappedTest.java
+++ b/src/test/java/org/cactoos/list/MappedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 
 /**
  * Test case for {@link Mapped}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/list/ShuffledTest.java b/src/test/java/org/cactoos/list/ShuffledTest.java
index 8314b5f8da..d9b3697a66 100644
--- a/src/test/java/org/cactoos/list/ShuffledTest.java
+++ b/src/test/java/org/cactoos/list/ShuffledTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test Case for {@link Shuffled}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.23
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/list/SolidListTest.java b/src/test/java/org/cactoos/list/SolidListTest.java
index 7d58ecd54b..4b2264c6d7 100644
--- a/src/test/java/org/cactoos/list/SolidListTest.java
+++ b/src/test/java/org/cactoos/list/SolidListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,9 +34,6 @@
 
 /**
  * Test case for {@link SolidList}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 lines)
diff --git a/src/test/java/org/cactoos/list/SortedTest.java b/src/test/java/org/cactoos/list/SortedTest.java
index 3b831a698a..5be0d80436 100644
--- a/src/test/java/org/cactoos/list/SortedTest.java
+++ b/src/test/java/org/cactoos/list/SortedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test Case for {@link Sorted}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.19
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/list/StickyListTest.java b/src/test/java/org/cactoos/list/StickyListTest.java
index 832b814ef5..4f67576913 100644
--- a/src/test/java/org/cactoos/list/StickyListTest.java
+++ b/src/test/java/org/cactoos/list/StickyListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,9 +35,6 @@
 
 /**
  * Test case for {@link StickyList}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/list/SyncListTest.java b/src/test/java/org/cactoos/list/SyncListTest.java
index 887804e12f..a2fe48c056 100644
--- a/src/test/java/org/cactoos/list/SyncListTest.java
+++ b/src/test/java/org/cactoos/list/SyncListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,9 +30,6 @@
 
 /**
  * Test case for {@link SyncList}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/list/package-info.java b/src/test/java/org/cactoos/list/package-info.java
index 9d3508a71d..886c7a849e 100644
--- a/src/test/java/org/cactoos/list/package-info.java
+++ b/src/test/java/org/cactoos/list/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Lists.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  */
 package org.cactoos.list;
diff --git a/src/test/java/org/cactoos/map/BehavesAsMap.java b/src/test/java/org/cactoos/map/BehavesAsMap.java
index 872a70ef0c..fd3f9e5527 100644
--- a/src/test/java/org/cactoos/map/BehavesAsMap.java
+++ b/src/test/java/org/cactoos/map/BehavesAsMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Matcher for collection.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <K> Type of key
  * @param <V> Type of value
  * @since 0.24
diff --git a/src/test/java/org/cactoos/map/ClearDeletesAllValues.java b/src/test/java/org/cactoos/map/ClearDeletesAllValues.java
index 89a03b85f9..761c775d14 100644
--- a/src/test/java/org/cactoos/map/ClearDeletesAllValues.java
+++ b/src/test/java/org/cactoos/map/ClearDeletesAllValues.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Check a clear method.
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @param <K> Type of key
  * @param <V> Type of value
  * @since 0.30
diff --git a/src/test/java/org/cactoos/map/GroupedTest.java b/src/test/java/org/cactoos/map/GroupedTest.java
index a793480df1..e7b23aef92 100644
--- a/src/test/java/org/cactoos/map/GroupedTest.java
+++ b/src/test/java/org/cactoos/map/GroupedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link Grouped}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/map/MapEntryTest.java b/src/test/java/org/cactoos/map/MapEntryTest.java
index cb95e740f5..ec9faa3483 100644
--- a/src/test/java/org/cactoos/map/MapEntryTest.java
+++ b/src/test/java/org/cactoos/map/MapEntryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link MapEntry}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/map/MapEnvelopeTest.java b/src/test/java/org/cactoos/map/MapEnvelopeTest.java
index c48ea3e571..dccb0426f8 100644
--- a/src/test/java/org/cactoos/map/MapEnvelopeTest.java
+++ b/src/test/java/org/cactoos/map/MapEnvelopeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 /**
  * Test case for {@link MapEnvelope}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.4
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/map/MapNoNullsTest.java b/src/test/java/org/cactoos/map/MapNoNullsTest.java
index 78263cd631..ac20defc67 100644
--- a/src/test/java/org/cactoos/map/MapNoNullsTest.java
+++ b/src/test/java/org/cactoos/map/MapNoNullsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link MapNoNulls}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/map/MapOfTest.java b/src/test/java/org/cactoos/map/MapOfTest.java
index 09808c9e44..cddc5d9424 100644
--- a/src/test/java/org/cactoos/map/MapOfTest.java
+++ b/src/test/java/org/cactoos/map/MapOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,8 +38,6 @@
 /**
  * Test case for {@link MapOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.4
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/map/PutAllUpdatesValues.java b/src/test/java/org/cactoos/map/PutAllUpdatesValues.java
index 3079a06661..a3fec6d64e 100644
--- a/src/test/java/org/cactoos/map/PutAllUpdatesValues.java
+++ b/src/test/java/org/cactoos/map/PutAllUpdatesValues.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Check a putAll method.
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @param <K> Type of key
  * @param <V> Type of value
  * @since 0.30
diff --git a/src/test/java/org/cactoos/map/PutUpdatesValues.java b/src/test/java/org/cactoos/map/PutUpdatesValues.java
index f982aa10a9..e7e680aa73 100644
--- a/src/test/java/org/cactoos/map/PutUpdatesValues.java
+++ b/src/test/java/org/cactoos/map/PutUpdatesValues.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Check a put method.
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @param <K> Type of key
  * @param <V> Type of value
  * @since 0.30
diff --git a/src/test/java/org/cactoos/map/RemoveDeletesValues.java b/src/test/java/org/cactoos/map/RemoveDeletesValues.java
index c8a6a6a8c6..45ee516ccf 100644
--- a/src/test/java/org/cactoos/map/RemoveDeletesValues.java
+++ b/src/test/java/org/cactoos/map/RemoveDeletesValues.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Check a remove method.
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @param <K> Type of key
  * @param <V> Type of value
  * @since 0.30
diff --git a/src/test/java/org/cactoos/map/SolidMapTest.java b/src/test/java/org/cactoos/map/SolidMapTest.java
index c6281cb1dc..b3685580f4 100644
--- a/src/test/java/org/cactoos/map/SolidMapTest.java
+++ b/src/test/java/org/cactoos/map/SolidMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,9 +38,6 @@
 /**
  * Test case for {@link SolidMap}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Stanislav Myachenkov (s.myachenkov@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/map/StickyMapTest.java b/src/test/java/org/cactoos/map/StickyMapTest.java
index 22b673cf4f..0e844ee970 100644
--- a/src/test/java/org/cactoos/map/StickyMapTest.java
+++ b/src/test/java/org/cactoos/map/StickyMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,8 +36,6 @@
 /**
  * Test case for {@link StickyMap}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/map/SyncMapTest.java b/src/test/java/org/cactoos/map/SyncMapTest.java
index fb58a0b707..139c1efb07 100644
--- a/src/test/java/org/cactoos/map/SyncMapTest.java
+++ b/src/test/java/org/cactoos/map/SyncMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link StickyMap}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/map/package-info.java b/src/test/java/org/cactoos/map/package-info.java
index 6da1d0b7dd..fc2b32c440 100644
--- a/src/test/java/org/cactoos/map/package-info.java
+++ b/src/test/java/org/cactoos/map/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Maps, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.14
  */
 package org.cactoos.map;
diff --git a/src/test/java/org/cactoos/matchers/TeeInputHasResultTest.java b/src/test/java/org/cactoos/matchers/TeeInputHasResultTest.java
index fc31018bab..784fb5df41 100644
--- a/src/test/java/org/cactoos/matchers/TeeInputHasResultTest.java
+++ b/src/test/java/org/cactoos/matchers/TeeInputHasResultTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 /**
  * Test case for {@link TeeInputHasResult}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/matchers/TextHasStringTest.java b/src/test/java/org/cactoos/matchers/TextHasStringTest.java
index 86a888fb9c..0a0a9757a6 100644
--- a/src/test/java/org/cactoos/matchers/TextHasStringTest.java
+++ b/src/test/java/org/cactoos/matchers/TextHasStringTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 /**
  * Test case for {@link TextHasString}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/matchers/package-info.java b/src/test/java/org/cactoos/matchers/package-info.java
index 822af732e8..bc2b4e3177 100644
--- a/src/test/java/org/cactoos/matchers/package-info.java
+++ b/src/test/java/org/cactoos/matchers/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Matcher's tests.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.1
  */
 package org.cactoos.matchers;
diff --git a/src/test/java/org/cactoos/package-info.java b/src/test/java/org/cactoos/package-info.java
index 5f98e64198..5951ae1452 100644
--- a/src/test/java/org/cactoos/package-info.java
+++ b/src/test/java/org/cactoos/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Tests.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.9
  */
 package org.cactoos;
diff --git a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java
index db2c5c0d18..f0674ce734 100644
--- a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java
+++ b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -43,9 +43,6 @@
 
 /**
  * Test case for {@link AndInThreads}.
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.25
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/AndTest.java b/src/test/java/org/cactoos/scalar/AndTest.java
index 9b2ff9f3af..d71e5757ed 100644
--- a/src/test/java/org/cactoos/scalar/AndTest.java
+++ b/src/test/java/org/cactoos/scalar/AndTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,9 +39,6 @@
 
 /**
  * Test case for {@link And}.
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/AndWithIndexTest.java b/src/test/java/org/cactoos/scalar/AndWithIndexTest.java
index 0adfbdbda4..26be4c25b9 100644
--- a/src/test/java/org/cactoos/scalar/AndWithIndexTest.java
+++ b/src/test/java/org/cactoos/scalar/AndWithIndexTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 /**
  * Test case for {@link AndWithIndex}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/AvgOfTest.java b/src/test/java/org/cactoos/scalar/AvgOfTest.java
index 9607abcd36..b1d2e170e9 100644
--- a/src/test/java/org/cactoos/scalar/AvgOfTest.java
+++ b/src/test/java/org/cactoos/scalar/AvgOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link AvgOf}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/BoolOfTest.java b/src/test/java/org/cactoos/scalar/BoolOfTest.java
index ee8734fda0..fb595ef192 100644
--- a/src/test/java/org/cactoos/scalar/BoolOfTest.java
+++ b/src/test/java/org/cactoos/scalar/BoolOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link BoolOf}.
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/CheckedScalarTest.java b/src/test/java/org/cactoos/scalar/CheckedScalarTest.java
index a96c3aceda..54a63af5a0 100644
--- a/src/test/java/org/cactoos/scalar/CheckedScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/CheckedScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for {@link CheckedScalar}.
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/ConstantTest.java b/src/test/java/org/cactoos/scalar/ConstantTest.java
index ba0a597cda..600d7baf56 100644
--- a/src/test/java/org/cactoos/scalar/ConstantTest.java
+++ b/src/test/java/org/cactoos/scalar/ConstantTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link Constant}.
- * @author Aliceice (elena.ihde-simon@posteo.de)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/EqualityTest.java b/src/test/java/org/cactoos/scalar/EqualityTest.java
index 5e905ca474..0255b419d5 100644
--- a/src/test/java/org/cactoos/scalar/EqualityTest.java
+++ b/src/test/java/org/cactoos/scalar/EqualityTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test case for {@link Equality}.
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/EqualsTest.java b/src/test/java/org/cactoos/scalar/EqualsTest.java
index 45a0c68d3e..2c4f83b967 100644
--- a/src/test/java/org/cactoos/scalar/EqualsTest.java
+++ b/src/test/java/org/cactoos/scalar/EqualsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link Equals}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/FallbackFromTest.java b/src/test/java/org/cactoos/scalar/FallbackFromTest.java
index b7495e0b93..aef4c467ce 100644
--- a/src/test/java/org/cactoos/scalar/FallbackFromTest.java
+++ b/src/test/java/org/cactoos/scalar/FallbackFromTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 /**
  * Test case for {@link FallbackFrom}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/FalseTest.java b/src/test/java/org/cactoos/scalar/FalseTest.java
index 55b14236b6..bb05bbb91c 100644
--- a/src/test/java/org/cactoos/scalar/FalseTest.java
+++ b/src/test/java/org/cactoos/scalar/FalseTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link False}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.7
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/FoldedTest.java b/src/test/java/org/cactoos/scalar/FoldedTest.java
index b23f3296dd..de066dbe3c 100644
--- a/src/test/java/org/cactoos/scalar/FoldedTest.java
+++ b/src/test/java/org/cactoos/scalar/FoldedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for {@link Folded}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/HighestOfTest.java b/src/test/java/org/cactoos/scalar/HighestOfTest.java
index f60f33bad3..955ed48961 100644
--- a/src/test/java/org/cactoos/scalar/HighestOfTest.java
+++ b/src/test/java/org/cactoos/scalar/HighestOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,9 +34,6 @@
 /**
  * Test case for {@link HighestOf}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @author Eduard Balovnev (bedward70@mail.ru)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/InheritanceLevelTest.java b/src/test/java/org/cactoos/scalar/InheritanceLevelTest.java
index 2639d328b6..a78e89ba49 100644
--- a/src/test/java/org/cactoos/scalar/InheritanceLevelTest.java
+++ b/src/test/java/org/cactoos/scalar/InheritanceLevelTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link InheritanceLevel}.
  *
- * @author Vedran Vatavuk (123vgv@gmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/IoCheckedScalarTest.java b/src/test/java/org/cactoos/scalar/IoCheckedScalarTest.java
index 9d1f207b6e..1d1ae40023 100644
--- a/src/test/java/org/cactoos/scalar/IoCheckedScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/IoCheckedScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link IoCheckedScalar}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.4
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/ItemAtTest.java b/src/test/java/org/cactoos/scalar/ItemAtTest.java
index ff6574a6d4..7785bb55f2 100644
--- a/src/test/java/org/cactoos/scalar/ItemAtTest.java
+++ b/src/test/java/org/cactoos/scalar/ItemAtTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 
 /**
  * Test Case for {@link ItemAt}.
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.7
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/LowestOfTest.java b/src/test/java/org/cactoos/scalar/LowestOfTest.java
index 2781383736..aad82d9562 100644
--- a/src/test/java/org/cactoos/scalar/LowestOfTest.java
+++ b/src/test/java/org/cactoos/scalar/LowestOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,9 +34,6 @@
 /**
  * Test case for {@link LowestOf}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @author Eduard Balovnev (bedward70@mail.ru)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/MaxOfTest.java b/src/test/java/org/cactoos/scalar/MaxOfTest.java
index 0fb053c95b..43f424dea6 100644
--- a/src/test/java/org/cactoos/scalar/MaxOfTest.java
+++ b/src/test/java/org/cactoos/scalar/MaxOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link MaxOf}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.10
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/MinOfTest.java b/src/test/java/org/cactoos/scalar/MinOfTest.java
index 361f031b47..843ae967e9 100644
--- a/src/test/java/org/cactoos/scalar/MinOfTest.java
+++ b/src/test/java/org/cactoos/scalar/MinOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link MinOf}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.10
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/NotTest.java b/src/test/java/org/cactoos/scalar/NotTest.java
index c05f0dd4e8..000a138a01 100644
--- a/src/test/java/org/cactoos/scalar/NotTest.java
+++ b/src/test/java/org/cactoos/scalar/NotTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link Not}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.7
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/NumberOfTest.java b/src/test/java/org/cactoos/scalar/NumberOfTest.java
index dd48dc2d60..eed1cfef89 100644
--- a/src/test/java/org/cactoos/scalar/NumberOfTest.java
+++ b/src/test/java/org/cactoos/scalar/NumberOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link NumberOf}.
  *
- * @author Kirill (g4s8.public@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/OrTest.java b/src/test/java/org/cactoos/scalar/OrTest.java
index 1ec84e237d..0120151d96 100644
--- a/src/test/java/org/cactoos/scalar/OrTest.java
+++ b/src/test/java/org/cactoos/scalar/OrTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -37,9 +37,6 @@
 /**
  * Test case for {@link Or}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 line)
diff --git a/src/test/java/org/cactoos/scalar/PropertiesOfTest.java b/src/test/java/org/cactoos/scalar/PropertiesOfTest.java
index 07eaa9d504..86f7bcab85 100644
--- a/src/test/java/org/cactoos/scalar/PropertiesOfTest.java
+++ b/src/test/java/org/cactoos/scalar/PropertiesOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
 /**
  * Test case for {@link PropertiesOf}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.7
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/ReducedTest.java b/src/test/java/org/cactoos/scalar/ReducedTest.java
index a3d7e9ead4..c7bf42cd59 100644
--- a/src/test/java/org/cactoos/scalar/ReducedTest.java
+++ b/src/test/java/org/cactoos/scalar/ReducedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 
 /**
  * Test case for {@link Reduced}.
- * @author Eduard Balovnev (bedward70@mail.ru)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/RetryScalarTest.java b/src/test/java/org/cactoos/scalar/RetryScalarTest.java
index 738e7b7210..4f96fbecb2 100644
--- a/src/test/java/org/cactoos/scalar/RetryScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/RetryScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link RetryScalar}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/ScalarWithFallbackTest.java b/src/test/java/org/cactoos/scalar/ScalarWithFallbackTest.java
index e78cc7656f..3468c08eea 100644
--- a/src/test/java/org/cactoos/scalar/ScalarWithFallbackTest.java
+++ b/src/test/java/org/cactoos/scalar/ScalarWithFallbackTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link ScalarWithFallback}.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/SolidScalarTest.java b/src/test/java/org/cactoos/scalar/SolidScalarTest.java
index 1eaa9cf08b..f9d48c3ee9 100644
--- a/src/test/java/org/cactoos/scalar/SolidScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/SolidScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link SolidScalar}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/StickyScalarTest.java b/src/test/java/org/cactoos/scalar/StickyScalarTest.java
index 1e6ef25b0c..be5c9d1439 100644
--- a/src/test/java/org/cactoos/scalar/StickyScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/StickyScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test case for {@link StickyScalar}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.4
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/SumOfDoubleScalarTest.java b/src/test/java/org/cactoos/scalar/SumOfDoubleScalarTest.java
index 6638ddd39e..a8f96fd872 100644
--- a/src/test/java/org/cactoos/scalar/SumOfDoubleScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/SumOfDoubleScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link SumOfDoubleScalar}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/SumOfFloatScalarTest.java b/src/test/java/org/cactoos/scalar/SumOfFloatScalarTest.java
index edecd81104..68901a26e9 100644
--- a/src/test/java/org/cactoos/scalar/SumOfFloatScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/SumOfFloatScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link SumOfFloatScalar}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/SumOfIntScalarTest.java b/src/test/java/org/cactoos/scalar/SumOfIntScalarTest.java
index 976cc5ba4b..74e250cd6d 100644
--- a/src/test/java/org/cactoos/scalar/SumOfIntScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/SumOfIntScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link SumOfIntScalar}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/SumOfLongScalarTest.java b/src/test/java/org/cactoos/scalar/SumOfLongScalarTest.java
index 4cb8c622df..7f737ce1ce 100644
--- a/src/test/java/org/cactoos/scalar/SumOfLongScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/SumOfLongScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link SumOfLongScalar}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/SumOfScalarTest.java b/src/test/java/org/cactoos/scalar/SumOfScalarTest.java
index 4bb6d3a2ef..6fdd360793 100644
--- a/src/test/java/org/cactoos/scalar/SumOfScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/SumOfScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link SumOfScalar}.
  *
- * @author Nikita Salomatin (nsalomatin@hotmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/SumOfTest.java b/src/test/java/org/cactoos/scalar/SumOfTest.java
index 351e3a32aa..57d93a0602 100644
--- a/src/test/java/org/cactoos/scalar/SumOfTest.java
+++ b/src/test/java/org/cactoos/scalar/SumOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Test case for {@link SumOf}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/SyncScalarTest.java b/src/test/java/org/cactoos/scalar/SyncScalarTest.java
index 4b8c22e9ad..ca42326c29 100644
--- a/src/test/java/org/cactoos/scalar/SyncScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/SyncScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link SyncScalar}.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.24
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/TernaryTest.java b/src/test/java/org/cactoos/scalar/TernaryTest.java
index 464f79bfd2..f2dc6a73d1 100644
--- a/src/test/java/org/cactoos/scalar/TernaryTest.java
+++ b/src/test/java/org/cactoos/scalar/TernaryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,9 +29,6 @@
 
 /**
  * Test case for {@link Ternary}.
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/scalar/TrueTest.java b/src/test/java/org/cactoos/scalar/TrueTest.java
index 585c89bc70..b9b5f9fce8 100644
--- a/src/test/java/org/cactoos/scalar/TrueTest.java
+++ b/src/test/java/org/cactoos/scalar/TrueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link True}.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.7
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/UncheckedScalarTest.java b/src/test/java/org/cactoos/scalar/UncheckedScalarTest.java
index b9028b3f82..9a19e9b480 100644
--- a/src/test/java/org/cactoos/scalar/UncheckedScalarTest.java
+++ b/src/test/java/org/cactoos/scalar/UncheckedScalarTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link UncheckedScalar}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.3
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/scalar/package-info.java b/src/test/java/org/cactoos/scalar/package-info.java
index b4f2e3dffa..2049d22dbe 100644
--- a/src/test/java/org/cactoos/scalar/package-info.java
+++ b/src/test/java/org/cactoos/scalar/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Scalars, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.12
  */
 package org.cactoos.scalar;
diff --git a/src/test/java/org/cactoos/text/AbbreviatedTextTest.java b/src/test/java/org/cactoos/text/AbbreviatedTextTest.java
index 1a82235067..38066d9100 100644
--- a/src/test/java/org/cactoos/text/AbbreviatedTextTest.java
+++ b/src/test/java/org/cactoos/text/AbbreviatedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link AbbreviatedText}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/Base64TextTest.java b/src/test/java/org/cactoos/text/Base64TextTest.java
index e800d03fc4..0507f7062c 100644
--- a/src/test/java/org/cactoos/text/Base64TextTest.java
+++ b/src/test/java/org/cactoos/text/Base64TextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 /**
  * Test Case for {@link org.cactoos.text.Base64Text}.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 public final class Base64TextTest {
diff --git a/src/test/java/org/cactoos/text/ComparableTextTest.java b/src/test/java/org/cactoos/text/ComparableTextTest.java
index 5bbf1afcbc..3735c8b513 100644
--- a/src/test/java/org/cactoos/text/ComparableTextTest.java
+++ b/src/test/java/org/cactoos/text/ComparableTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link FormattedText}.
  *
- * @author Sergey Sharov (zefick@mail.ru)
- * @version $Id$
  * @since 0.27
  * @checkstyle JavadocMethodCheck (100 lines)
  */
diff --git a/src/test/java/org/cactoos/text/FormattedTextTest.java b/src/test/java/org/cactoos/text/FormattedTextTest.java
index 4c638224f2..f2b3603ea4 100644
--- a/src/test/java/org/cactoos/text/FormattedTextTest.java
+++ b/src/test/java/org/cactoos/text/FormattedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -36,9 +36,6 @@
 /**
  * Test case for {@link FormattedText}.
  *
- * @author Andriy Kryvtsun (kontiky@gmail.com)
- * @author Ix (ixmanuel@yahoo.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/HexOfTest.java b/src/test/java/org/cactoos/text/HexOfTest.java
index c8462b1a9f..e4bebd2de9 100644
--- a/src/test/java/org/cactoos/text/HexOfTest.java
+++ b/src/test/java/org/cactoos/text/HexOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for {@link HexOf}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.28
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/IsBlankTest.java b/src/test/java/org/cactoos/text/IsBlankTest.java
index d3aeb1fb4b..a3fbb29f4c 100644
--- a/src/test/java/org/cactoos/text/IsBlankTest.java
+++ b/src/test/java/org/cactoos/text/IsBlankTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link IsBlank}.
- * @author Andriy Kryvtsun (kontiky@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/JoinedTextTest.java b/src/test/java/org/cactoos/text/JoinedTextTest.java
index 5ccae04be0..7499c2a3e1 100644
--- a/src/test/java/org/cactoos/text/JoinedTextTest.java
+++ b/src/test/java/org/cactoos/text/JoinedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test case for {@link JoinedText}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/LowerTextTest.java b/src/test/java/org/cactoos/text/LowerTextTest.java
index 1138d96c6b..44b1205b06 100644
--- a/src/test/java/org/cactoos/text/LowerTextTest.java
+++ b/src/test/java/org/cactoos/text/LowerTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link LowerText}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/NormalizedTextTest.java b/src/test/java/org/cactoos/text/NormalizedTextTest.java
index f6900a6632..ed89f2710f 100644
--- a/src/test/java/org/cactoos/text/NormalizedTextTest.java
+++ b/src/test/java/org/cactoos/text/NormalizedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 
 /**
  * Test case for {@link NormalizedText}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/PaddedStartTextTest.java b/src/test/java/org/cactoos/text/PaddedStartTextTest.java
index a3a3fd5380..52f0ed1f8f 100644
--- a/src/test/java/org/cactoos/text/PaddedStartTextTest.java
+++ b/src/test/java/org/cactoos/text/PaddedStartTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link PaddedStartText}.
  *
- * @author Vivek Poddar (vivekimsit@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/RandomTextTest.java b/src/test/java/org/cactoos/text/RandomTextTest.java
index 2cf5929d59..b425d194c1 100644
--- a/src/test/java/org/cactoos/text/RandomTextTest.java
+++ b/src/test/java/org/cactoos/text/RandomTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Roman Proshin (roman@proshin.org)
- * @version $Id$
  * @since 0.32
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/text/RepeatedTextTest.java b/src/test/java/org/cactoos/text/RepeatedTextTest.java
index c7b15e8dab..52bcfd88b1 100644
--- a/src/test/java/org/cactoos/text/RepeatedTextTest.java
+++ b/src/test/java/org/cactoos/text/RepeatedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link RepeatedText}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/ReplacedTextTest.java b/src/test/java/org/cactoos/text/ReplacedTextTest.java
index d69343a691..28cc9b2461 100644
--- a/src/test/java/org/cactoos/text/ReplacedTextTest.java
+++ b/src/test/java/org/cactoos/text/ReplacedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 /**
  * Test case for {@link ReplacedText}.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/ReversedTextTest.java b/src/test/java/org/cactoos/text/ReversedTextTest.java
index 960974c1cb..f22859767a 100644
--- a/src/test/java/org/cactoos/text/ReversedTextTest.java
+++ b/src/test/java/org/cactoos/text/ReversedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link ReversedText}.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/RotatedTextTest.java b/src/test/java/org/cactoos/text/RotatedTextTest.java
index 87993b978c..f8451b6425 100644
--- a/src/test/java/org/cactoos/text/RotatedTextTest.java
+++ b/src/test/java/org/cactoos/text/RotatedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link RotatedText}.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/SplitTextTest.java b/src/test/java/org/cactoos/text/SplitTextTest.java
index 83e96b4a41..c879ca7eb9 100644
--- a/src/test/java/org/cactoos/text/SplitTextTest.java
+++ b/src/test/java/org/cactoos/text/SplitTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,9 +31,6 @@
 
 /**
  * Test case for {@link SplitText}.
- * @author Alexey Semenyuk (semenyukalexey@gmail.com)
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/SubTextTest.java b/src/test/java/org/cactoos/text/SubTextTest.java
index 055c746b4e..d1ef1c6cc1 100644
--- a/src/test/java/org/cactoos/text/SubTextTest.java
+++ b/src/test/java/org/cactoos/text/SubTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link SubText}.
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.11
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/SwappedCaseTextTest.java b/src/test/java/org/cactoos/text/SwappedCaseTextTest.java
index 9e2af3e352..a3cd03e8db 100644
--- a/src/test/java/org/cactoos/text/SwappedCaseTextTest.java
+++ b/src/test/java/org/cactoos/text/SwappedCaseTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
 /**
  * Test case for {@link SwappedCaseText}.
  *
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.13.3
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/TextBase64Test.java b/src/test/java/org/cactoos/text/TextBase64Test.java
index 3090aead40..8f6f7789e1 100644
--- a/src/test/java/org/cactoos/text/TextBase64Test.java
+++ b/src/test/java/org/cactoos/text/TextBase64Test.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Test case for  {@link org.cactoos.text.TextBase64}.
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 public final class TextBase64Test {
diff --git a/src/test/java/org/cactoos/text/TextEnvelopeTest.java b/src/test/java/org/cactoos/text/TextEnvelopeTest.java
index a88aeffdbb..63a9214554 100644
--- a/src/test/java/org/cactoos/text/TextEnvelopeTest.java
+++ b/src/test/java/org/cactoos/text/TextEnvelopeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Tests for {@link TextEnvelope}.
- * @author Paulo Lobo (pauloeduardolobo@gmail.com)
- * @version $Id$
  * @since 0.32
  */
 public final class TextEnvelopeTest {
diff --git a/src/test/java/org/cactoos/text/TextOfTest.java b/src/test/java/org/cactoos/text/TextOfTest.java
index 7ae4be97c2..61e67ee071 100644
--- a/src/test/java/org/cactoos/text/TextOfTest.java
+++ b/src/test/java/org/cactoos/text/TextOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -38,10 +38,6 @@
 /**
  * Test case for {@link TextOf}.
  *
- * @author Ix (ixmanuel@yahoo.com)
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
diff --git a/src/test/java/org/cactoos/text/TrimmedLeftTextTest.java b/src/test/java/org/cactoos/text/TrimmedLeftTextTest.java
index 173ec5052a..a8389f50f9 100644
--- a/src/test/java/org/cactoos/text/TrimmedLeftTextTest.java
+++ b/src/test/java/org/cactoos/text/TrimmedLeftTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link TrimmedLeftText}.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/TrimmedRightTextTest.java b/src/test/java/org/cactoos/text/TrimmedRightTextTest.java
index ab09a45d06..b8da2b7e64 100644
--- a/src/test/java/org/cactoos/text/TrimmedRightTextTest.java
+++ b/src/test/java/org/cactoos/text/TrimmedRightTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link TrimmedRightText}.
- * @author Mehmet Yildirim (memoyil@gmail.com)
- * @version $Id$
  * @since 0.12
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/TrimmedTextTest.java b/src/test/java/org/cactoos/text/TrimmedTextTest.java
index 0858fe3a68..dc4ff577da 100644
--- a/src/test/java/org/cactoos/text/TrimmedTextTest.java
+++ b/src/test/java/org/cactoos/text/TrimmedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link TrimmedText}.
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/UncheckedTextTest.java b/src/test/java/org/cactoos/text/UncheckedTextTest.java
index b1df523d06..ac684d670f 100644
--- a/src/test/java/org/cactoos/text/UncheckedTextTest.java
+++ b/src/test/java/org/cactoos/text/UncheckedTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 /**
  * Test case for {@link UncheckedText}.
  *
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @since 0.3
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/UpperTextTest.java b/src/test/java/org/cactoos/text/UpperTextTest.java
index 96255cadd3..30efe001b2 100644
--- a/src/test/java/org/cactoos/text/UpperTextTest.java
+++ b/src/test/java/org/cactoos/text/UpperTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -29,8 +29,6 @@
 
 /**
  * Test case for {@link UpperText}.
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  */
diff --git a/src/test/java/org/cactoos/text/package-info.java b/src/test/java/org/cactoos/text/package-info.java
index ec9fea7f17..3b9dd08c5f 100644
--- a/src/test/java/org/cactoos/text/package-info.java
+++ b/src/test/java/org/cactoos/text/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Texts, tests.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 package org.cactoos.text;
diff --git a/src/test/java/org/cactoos/time/DateAsTextTest.java b/src/test/java/org/cactoos/time/DateAsTextTest.java
index dbcc31a2b7..c26b920319 100644
--- a/src/test/java/org/cactoos/time/DateAsTextTest.java
+++ b/src/test/java/org/cactoos/time/DateAsTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Tests for DateAsText.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/DateOfTest.java b/src/test/java/org/cactoos/time/DateOfTest.java
index ce9e70cf29..4440a59bd8 100644
--- a/src/test/java/org/cactoos/time/DateOfTest.java
+++ b/src/test/java/org/cactoos/time/DateOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 
 /**
  * Tests for DateOf.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/LocalDateAsTextTest.java b/src/test/java/org/cactoos/time/LocalDateAsTextTest.java
index a0b8ed01fc..d713f4da59 100644
--- a/src/test/java/org/cactoos/time/LocalDateAsTextTest.java
+++ b/src/test/java/org/cactoos/time/LocalDateAsTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 
 /**
  * Tests for LocalDateAsText.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/LocalDateTimeAsTextTest.java b/src/test/java/org/cactoos/time/LocalDateTimeAsTextTest.java
index beb727169a..106341b314 100644
--- a/src/test/java/org/cactoos/time/LocalDateTimeAsTextTest.java
+++ b/src/test/java/org/cactoos/time/LocalDateTimeAsTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
 
 /**
  * Tests for LocalDateTimeAsText.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 0.28
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/LocalDateTimeOfTest.java b/src/test/java/org/cactoos/time/LocalDateTimeOfTest.java
index c7620d0e35..cd8411809e 100644
--- a/src/test/java/org/cactoos/time/LocalDateTimeOfTest.java
+++ b/src/test/java/org/cactoos/time/LocalDateTimeOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 
 /**
  * Tests for {@link LocalDateTimeOf}.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/OffsetDateTimeAsTextTest.java b/src/test/java/org/cactoos/time/OffsetDateTimeAsTextTest.java
index 18cf273b8d..45ca80cac7 100644
--- a/src/test/java/org/cactoos/time/OffsetDateTimeAsTextTest.java
+++ b/src/test/java/org/cactoos/time/OffsetDateTimeAsTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Tests for OffsetDateTimeAsText.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/OffsetDateTimeOfTest.java b/src/test/java/org/cactoos/time/OffsetDateTimeOfTest.java
index 3fbf8d7ccd..0000015edc 100644
--- a/src/test/java/org/cactoos/time/OffsetDateTimeOfTest.java
+++ b/src/test/java/org/cactoos/time/OffsetDateTimeOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Tests for {@link OffsetDateTimeOf}.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/ZonedDateTimeAsTextTest.java b/src/test/java/org/cactoos/time/ZonedDateTimeAsTextTest.java
index 4cd9906c4c..3c80d5570d 100644
--- a/src/test/java/org/cactoos/time/ZonedDateTimeAsTextTest.java
+++ b/src/test/java/org/cactoos/time/ZonedDateTimeAsTextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
 
 /**
  * Tests for ZonedDateTimeAsText.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/ZonedDateTimeOfTest.java b/src/test/java/org/cactoos/time/ZonedDateTimeOfTest.java
index cebadd468b..a24b256cd3 100644
--- a/src/test/java/org/cactoos/time/ZonedDateTimeOfTest.java
+++ b/src/test/java/org/cactoos/time/ZonedDateTimeOfTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
 
 /**
  * Tests for {@link ZonedDateTimeOf}.
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
diff --git a/src/test/java/org/cactoos/time/package-info.java b/src/test/java/org/cactoos/time/package-info.java
index d054cb3a1a..b8dfaf4717 100644
--- a/src/test/java/org/cactoos/time/package-info.java
+++ b/src/test/java/org/cactoos/time/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Time, tests.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
- * @version $Id$
  * @since 1.0
  */
 package org.cactoos.time;