coding standard fixes