fix coding violations