Fixed some coding standard violations