Add comments to files and rename a method in Attachment.php