diff --git a/asset.module b/asset.module
index a4737c6..1747d32 100644
--- a/asset.module
+++ b/asset.module
@@ -111,7 +111,7 @@ function asset_entity_info() {
  *
  * @param $type_name
  *   If set, the type with the given name is returned.
- * @return AssetType[]
+ * @return AssetType[]|AssetType
  *   Depending whether $type isset, an array of asset types or a single one.
  */
 function assets_get_types($type_name = NULL) {
@@ -124,8 +124,9 @@ function assets_get_types($type_name = NULL) {
  *
  * @param $type
  *   The machine-readable name of an asset type to load.
- * @return
- *   An asset type array or FALSE if $type does not exist.
+ *
+ * @return AssetType|bool
+ *   An asset type object or FALSE if $type does not exist.
  */
 function asset_type_load($type) {
   return assets_get_types($type);
@@ -455,7 +456,8 @@ function asset_module_implements_alter(&$implementations, $hook) {
  *   Integer specifying the asset id.
  * @param $reset
  *   A boolean indicating that the internal cache should be reset.
- * @return
+ *
+ * @return object|bool
  *   A fully-loaded $asset object or FALSE if it cannot be loaded.
  *
  * @see asset_load_multiple()
@@ -488,10 +490,10 @@ function asset_load_multiple($aids = array(), $conditions = array(), $reset = FA
 /**
  * Returns the asset type of the passed asset or asset type string.
  *
- * @param $asset
+ * @param object|string $asset
  *   An asset object or string that indicates the asset type to return.
  *
- * @return
+ * @return AssetType|bool
  *   A single asset type, as an object, or FALSE if the asset type is not found.
  */
 function assets_get_type($asset) {
diff --git a/includes/asset.controllers.inc b/includes/asset.controllers.inc
index b07b41a..feb53f3 100644
--- a/includes/asset.controllers.inc
+++ b/includes/asset.controllers.inc
@@ -211,9 +211,6 @@ class AssetType extends Entity {
    *
    * We have to override this method just to invoke the entity_defaults_rebuild,
    * in case when no existent types were reverted
-   *
-   * @param $ids
-   * @param DatabaseTransaction | null $transaction
    */
   public function delete() {
     parent::delete();
diff --git a/includes/asset.migrate.inc b/includes/asset.migrate.inc
index f2aaa53..21e9353 100644
--- a/includes/asset.migrate.inc
+++ b/includes/asset.migrate.inc
@@ -85,14 +85,16 @@ class MigrateDestinationAsset extends MigrateDestinationEntity {
   /**
    * Import a single asset.
    *
-   * @param $mapped_asset
+   * @param stdClass $mapped_asset
    *   Asset object to build. Prefilled with any fields mapped in the Migration.
-   * @param $row
+   * @param stdClass $row
    *   Raw source data object - passed through to prepare/complete handlers.
+   *
    * @return array
    *   Array of key fields (aid only in this case) of the asset that was saved if
    *   successful. FALSE on failure.
    *
+   * @throws MigrateException exception.
    */
   public function import(stdClass $mapped_asset, stdClass $row) {
     $asset = new Asset(array('type' => $this->bundle));