Fixed more minor coding standard violations