diff --git a/Controller/Index/InitializePayment.php b/Controller/Index/InitializePayment.php
index b505d52a4aa..69969ceb3ba 100644
--- a/Controller/Index/InitializePayment.php
+++ b/Controller/Index/InitializePayment.php
@@ -3,9 +3,9 @@
  * This controller calls the initialization transaction if existing and necessary for the selected payment method.
  *
  * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
- * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved.
- * @link https://dev.heidelpay.de/magento
- * @author Simon Gabriel
+ * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved.
+ * @link https://dev.heidelpay.de/magento2
+ * @author David Owusu
  *
  * @package heidelpay
  * @subpackage magento2
diff --git a/Gateway/Config/HgwIDealPaymentConfig.php b/Gateway/Config/HgwIDealPaymentConfig.php
index 535ea2e271b..bea0a70dc84 100644
--- a/Gateway/Config/HgwIDealPaymentConfig.php
+++ b/Gateway/Config/HgwIDealPaymentConfig.php
@@ -1,9 +1,15 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: David.Owusu
- * Date: 04.09.2018
- * Time: 14:50
+ * Payment config representation for iDeal injected for HgwIDealPaymentConfigInterface.
+ *
+ * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
+ * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved.
+ *
+ * @link  http://dev.heidelpay.com/
+ *
+ * @author  David Owusu <development@heidelpay.com>
+ *
+ * @package  heidelpay/magento2
  */
 
 namespace Heidelpay\Gateway\Gateway\Config;
diff --git a/Gateway/Config/HgwIDealPaymentConfigInterface.php b/Gateway/Config/HgwIDealPaymentConfigInterface.php
index 97df32e77cb..189a2fccccd 100644
--- a/Gateway/Config/HgwIDealPaymentConfigInterface.php
+++ b/Gateway/Config/HgwIDealPaymentConfigInterface.php
@@ -1,9 +1,15 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: David.Owusu
- * Date: 04.09.2018
- * Time: 14:51
+ * Interface for payment config representation for iDeal.
+ *
+ * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
+ * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved.
+ *
+ * @link  http://dev.heidelpay.com/
+ *
+ * @author  David Owusu <development@heidelpay.com>
+ *
+ * @package  heidelpay/magento2
  */
 
 namespace Heidelpay\Gateway\Gateway\Config;
diff --git a/PaymentMethods/HeidelpayIDealPaymentMethod.php b/PaymentMethods/HeidelpayIDealPaymentMethod.php
index a7dd3f4b84a..0aca305512a 100644
--- a/PaymentMethods/HeidelpayIDealPaymentMethod.php
+++ b/PaymentMethods/HeidelpayIDealPaymentMethod.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: David.Owusu
- * Date: 04.09.2018
- * Time: 13:54
- */
 
 namespace Heidelpay\Gateway\PaymentMethods;
 
@@ -14,6 +8,20 @@
 use Heidelpay\Gateway\Model\ResourceModel\Transaction\CollectionFactory as HeidelpayTransactionCollectionFactory;
 use Heidelpay\PhpPaymentApi\Response;
 
+/**
+ * Heidelpay iDeal payment method
+ *
+ * This is the payment class for heidelpay iDeal
+ *
+ * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
+ * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved.
+ * @link http://dev.heidelpay.com/magento2
+ * @author David Owusu
+ *
+ * @package heidelpay
+ * @subpackage magento2
+ * @category magento2
+ */
 class HeidelpayIDealPaymentMethod extends HeidelpayAbstractPaymentMethod
 {
     const CODE = 'hgwidl';
diff --git a/view/frontend/web/template/payment/heidelpay-ideal-form.html b/view/frontend/web/template/payment/heidelpay-ideal-form.html
index 7aed3eac399..a5f3c20b3f3 100644
--- a/view/frontend/web/template/payment/heidelpay-ideal-form.html
+++ b/view/frontend/web/template/payment/heidelpay-ideal-form.html
@@ -1,3 +1,9 @@
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
 <div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
     <div class="payment-method-title field choice">
         <input type="radio"