fix coding standard issues