diff --git a/plugins/AttachmentCollections/AttachmentCollections.php b/plugins/AttachmentCollections/AttachmentCollections.php
index a5825a8256..2e28a746e2 100644
--- a/plugins/AttachmentCollections/AttachmentCollections.php
+++ b/plugins/AttachmentCollections/AttachmentCollections.php
@@ -85,6 +85,11 @@ class AttachmentCollections extends Plugin
         ]));
         return Event::next;
     }
+    /**
+     * Append Attachment Collections widget to the right panel.
+     * It's compose of two forms: one to select collections to add
+     * the current attachment to, and another to create a new collection.
+     */
     public function onAppendRightPanelBlock($vars, Request $request, &$res): bool
     {
         if ($vars['path'] !== 'attachment_show') return Event::next;
@@ -129,6 +134,8 @@ class AttachmentCollections extends Plugin
                 ],
             ]],
         ]);
+
+
         $add_form->handleRequest($request);
         if ($add_form->isSubmitted() && $add_form->isValid()) {
             $collections = $add_form->getData()['collections'];
@@ -140,7 +147,7 @@ class AttachmentCollections extends Plugin
                     . 'where entry.attachment_id = :aid and entry.collection_id in ('
                         . 'select collection.id from Plugin\AttachmentCollections\Entity\Collection collection '
                         . 'where collection.id in (:ids) '
-                        // prevent user from deleting something he doesn't own:
+                        // prevent user from deleting something (s)he doesn't own:
                         . 'and collection.actor_id = :id'
                     . ')',
                     ['aid' => $attachment_id, 'id' => $user->getId(), 'ids' => $removed]
diff --git a/plugins/AttachmentCollections/Controller/Controller.php b/plugins/AttachmentCollections/Controller/Controller.php
index 482953ac39..efd319c933 100644
--- a/plugins/AttachmentCollections/Controller/Controller.php
+++ b/plugins/AttachmentCollections/Controller/Controller.php
@@ -45,6 +45,12 @@ class Controller extends FeedController
     {
         return self::collectionsView($request, $id, null);
     }
+    /**
+     * Generate Collections page
+     * @param int     $id       actor id
+     * @param ?string $nickname actor nickname
+     * @return array            twig template options
+     */
     public function collectionsView(Request $request, int $id, ?string $nickname): array
     {
         $collections = DB::dql(
@@ -52,6 +58,7 @@ class Controller extends FeedController
             . 'where collection.actor_id = :id',
             ['id' => $id]
         );
+        // create collection form
         $create = null;
         if (Common::user()?->getId() === $id) {
             $create = Form::create([
@@ -80,6 +87,13 @@ class Controller extends FeedController
             }
         }
 
+        // We need to inject some functions in twig,
+        // but i don't want to create an enviroment for this
+        // as twig docs suggest in https://twig.symfony.com/doc/2.x/advanced.html#functions.
+        //
+        // Instead, I'm using an anonymous class to encapsulate
+        // the functions and passing how the class to the template.
+        // It's suggested at https://stackoverflow.com/a/50364502.
         $fn = new class ($id, $nickname, $request)
         {
             private $id;
@@ -91,6 +105,10 @@ class Controller extends FeedController
                 $this->nick = $nickname;
                 $this->request = $request;
             }
+            // there's already a injected function called path,
+            // that maps to Router::url(name, args), but since
+            // I want to preserve nicknames, I think it's better
+            // to use that getUrl function
             public function getUrl($cid)
             {
                 if (\is_null($this->nick)) {
@@ -104,6 +122,11 @@ class Controller extends FeedController
                     ['nickname' => $this->nick, 'cid' => $cid]
                 );
             }
+            // There are many collections in this page and we need two
+            // forms for each one of them: one form to edit the collection's
+            // name and another to remove the collection.
+
+            // creating the edit form
             public function editForm($collection)
             {
                 $edit = Form::create([
@@ -129,6 +152,7 @@ class Controller extends FeedController
                 }
                 return $edit->createView();
             }
+            // creating the remove form
             public function rmForm($collection)
             {
                 $rm = Form::create([