fixing coding standard violations