code standard fixes