Fix coding style fully

3 jobs for master in 11 seconds (queued for 8 seconds)
latest