removed unnecessary code parts, fixes phpdoc params and changed inner model method calls to static::