update according to coding styles +review CR-940