Conformed To Standard

Made changes to conform to yii standard