Updated code according to coding standards