Fixed some coding standard issues.