Updates as per Yii-2 coding style