Code standard fixes