updated code again for coding standard compliance :'(