Updates as per Yii2 coding style