Code format corrections