updated code according to our coding standard