many coding standard fixes