Code format fixes