diff --git a/LICENSE b/LICENSE
index f5e6e9c..84263c0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Simon Brunel
+Copyright (c) 2019 Simon Brunel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/include/QtPromise b/include/QtPromise
index 2e92a9f..658168a 100644
--- a/include/QtPromise
+++ b/include/QtPromise
@@ -5,4 +5,4 @@
 #include "../src/qtpromise/qpromisefuture.h"
 #include "../src/qtpromise/qpromisehelpers.h"
 
-#endif // ifndef QTPROMISE_MODULE_H
+#endif // QTPROMISE_MODULE_H
diff --git a/src/qtpromise/qpromise.h b/src/qtpromise/qpromise.h
index 3bfbaab..e2c1475 100644
--- a/src/qtpromise/qpromise.h
+++ b/src/qtpromise/qpromise.h
@@ -1,7 +1,6 @@
 #ifndef QTPROMISE_QPROMISE_H
 #define QTPROMISE_QPROMISE_H
 
-// QtPromise
 #include "qpromise_p.h"
 #include "qpromiseerror.h"
 #include "qpromiseglobal.h"
@@ -130,4 +129,4 @@ private:
 
 #include "qpromise.inl"
 
-#endif // ifndef QTPROMISE_QPROMISE_H
+#endif // QTPROMISE_QPROMISE_H
diff --git a/src/qtpromise/qpromise_p.h b/src/qtpromise/qpromise_p.h
index 5273e30..accbbf8 100644
--- a/src/qtpromise/qpromise_p.h
+++ b/src/qtpromise/qpromise_p.h
@@ -1,7 +1,6 @@
 #ifndef QTPROMISE_QPROMISE_P_H
 #define QTPROMISE_QPROMISE_P_H
 
-// QtPromise
 #include "qpromiseglobal.h"
 
 // Qt
@@ -547,4 +546,4 @@ protected:
 
 } // namespace QtPromise
 
-#endif // ifndef QTPROMISE_QPROMISE_H
+#endif // QTPROMISE_QPROMISE_H
diff --git a/src/qtpromise/qpromiseerror.h b/src/qtpromise/qpromiseerror.h
index 5d81897..831a30e 100644
--- a/src/qtpromise/qpromiseerror.h
+++ b/src/qtpromise/qpromiseerror.h
@@ -1,7 +1,6 @@
 #ifndef QTPROMISE_QPROMISEERROR_H
 #define QTPROMISE_QPROMISEERROR_H
 
-// QtPromise
 #include "qpromise_p.h"
 #include "qpromiseglobal.h"
 
diff --git a/src/qtpromise/qpromiseglobal.h b/src/qtpromise/qpromiseglobal.h
index 78beeac..b155ab8 100644
--- a/src/qtpromise/qpromiseglobal.h
+++ b/src/qtpromise/qpromiseglobal.h
@@ -122,4 +122,4 @@ struct ArgsOf<const volatile T&&> : public ArgsOf<T>
 
 } // namespace QtPromisePrivate
 
-#endif // ifndef QTPROMISE_QPROMISEGLOBAL_H
+#endif // QTPROMISE_QPROMISEGLOBAL_H
diff --git a/src/qtpromise/qpromisehelpers.h b/src/qtpromise/qpromisehelpers.h
index fd45d0f..85f3b1a 100644
--- a/src/qtpromise/qpromisehelpers.h
+++ b/src/qtpromise/qpromisehelpers.h
@@ -1,7 +1,6 @@
 #ifndef QTPROMISE_QPROMISEHELPERS_H
 #define QTPROMISE_QPROMISEHELPERS_H
 
-// QtPromise
 #include "qpromise_p.h"
 
 namespace QtPromise {
diff --git a/tests/auto/qtpromise/helpers/all/tst_all.cpp b/tests/auto/qtpromise/helpers/all/tst_all.cpp
index a0da309..a6e4ec3 100644
--- a/tests/auto/qtpromise/helpers/all/tst_all.cpp
+++ b/tests/auto/qtpromise/helpers/all/tst_all.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/helpers/attempt/tst_attempt.cpp b/tests/auto/qtpromise/helpers/attempt/tst_attempt.cpp
index 5eba854..87b9ff3 100644
--- a/tests/auto/qtpromise/helpers/attempt/tst_attempt.cpp
+++ b/tests/auto/qtpromise/helpers/attempt/tst_attempt.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/helpers/each/tst_each.cpp b/tests/auto/qtpromise/helpers/each/tst_each.cpp
index da4140d..40f87ce 100644
--- a/tests/auto/qtpromise/helpers/each/tst_each.cpp
+++ b/tests/auto/qtpromise/helpers/each/tst_each.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/helpers/filter/tst_filter.cpp b/tests/auto/qtpromise/helpers/filter/tst_filter.cpp
index 53e2ea3..6846faf 100644
--- a/tests/auto/qtpromise/helpers/filter/tst_filter.cpp
+++ b/tests/auto/qtpromise/helpers/filter/tst_filter.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/helpers/map/tst_map.cpp b/tests/auto/qtpromise/helpers/map/tst_map.cpp
index 287ef4c..0891570 100644
--- a/tests/auto/qtpromise/helpers/map/tst_map.cpp
+++ b/tests/auto/qtpromise/helpers/map/tst_map.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/helpers/reject/tst_reject.cpp b/tests/auto/qtpromise/helpers/reject/tst_reject.cpp
index 5bcb1d5..99d6c9f 100644
--- a/tests/auto/qtpromise/helpers/reject/tst_reject.cpp
+++ b/tests/auto/qtpromise/helpers/reject/tst_reject.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/helpers/resolve/tst_resolve.cpp b/tests/auto/qtpromise/helpers/resolve/tst_resolve.cpp
index 6d82895..ad6cfeb 100644
--- a/tests/auto/qtpromise/helpers/resolve/tst_resolve.cpp
+++ b/tests/auto/qtpromise/helpers/resolve/tst_resolve.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/construct/tst_construct.cpp b/tests/auto/qtpromise/qpromise/construct/tst_construct.cpp
index a428a3c..ced66cc 100644
--- a/tests/auto/qtpromise/qpromise/construct/tst_construct.cpp
+++ b/tests/auto/qtpromise/qpromise/construct/tst_construct.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/delay/tst_delay.cpp b/tests/auto/qtpromise/qpromise/delay/tst_delay.cpp
index 4b018db..95e40d5 100644
--- a/tests/auto/qtpromise/qpromise/delay/tst_delay.cpp
+++ b/tests/auto/qtpromise/qpromise/delay/tst_delay.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/each/tst_each.cpp b/tests/auto/qtpromise/qpromise/each/tst_each.cpp
index 80883f1..def7ea4 100644
--- a/tests/auto/qtpromise/qpromise/each/tst_each.cpp
+++ b/tests/auto/qtpromise/qpromise/each/tst_each.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/fail/tst_fail.cpp b/tests/auto/qtpromise/qpromise/fail/tst_fail.cpp
index 3477c2c..d46a621 100644
--- a/tests/auto/qtpromise/qpromise/fail/tst_fail.cpp
+++ b/tests/auto/qtpromise/qpromise/fail/tst_fail.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/filter/tst_filter.cpp b/tests/auto/qtpromise/qpromise/filter/tst_filter.cpp
index e033fea..b42e694 100644
--- a/tests/auto/qtpromise/qpromise/filter/tst_filter.cpp
+++ b/tests/auto/qtpromise/qpromise/filter/tst_filter.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/finally/tst_finally.cpp b/tests/auto/qtpromise/qpromise/finally/tst_finally.cpp
index c95d4a8..56ca08d 100644
--- a/tests/auto/qtpromise/qpromise/finally/tst_finally.cpp
+++ b/tests/auto/qtpromise/qpromise/finally/tst_finally.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/map/tst_map.cpp b/tests/auto/qtpromise/qpromise/map/tst_map.cpp
index 4319dfa..7ab5cb7 100644
--- a/tests/auto/qtpromise/qpromise/map/tst_map.cpp
+++ b/tests/auto/qtpromise/qpromise/map/tst_map.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/operators/tst_operators.cpp b/tests/auto/qtpromise/qpromise/operators/tst_operators.cpp
index 1332004..e1f9ff7 100644
--- a/tests/auto/qtpromise/qpromise/operators/tst_operators.cpp
+++ b/tests/auto/qtpromise/qpromise/operators/tst_operators.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/tap/tst_tap.cpp b/tests/auto/qtpromise/qpromise/tap/tst_tap.cpp
index 6061f9f..b662226 100644
--- a/tests/auto/qtpromise/qpromise/tap/tst_tap.cpp
+++ b/tests/auto/qtpromise/qpromise/tap/tst_tap.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/tapfail/tst_tapfail.cpp b/tests/auto/qtpromise/qpromise/tapfail/tst_tapfail.cpp
index 43c812a..754542e 100644
--- a/tests/auto/qtpromise/qpromise/tapfail/tst_tapfail.cpp
+++ b/tests/auto/qtpromise/qpromise/tapfail/tst_tapfail.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/then/tst_then.cpp b/tests/auto/qtpromise/qpromise/then/tst_then.cpp
index 245a56e..2ec5d6a 100644
--- a/tests/auto/qtpromise/qpromise/then/tst_then.cpp
+++ b/tests/auto/qtpromise/qpromise/then/tst_then.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise
diff --git a/tests/auto/qtpromise/qpromise/timeout/tst_timeout.cpp b/tests/auto/qtpromise/qpromise/timeout/tst_timeout.cpp
index fd40348..b4f6cd8 100644
--- a/tests/auto/qtpromise/qpromise/timeout/tst_timeout.cpp
+++ b/tests/auto/qtpromise/qpromise/timeout/tst_timeout.cpp
@@ -1,4 +1,3 @@
-// Tests
 #include "../../shared/utils.h"
 
 // QtPromise