Align definition and declaration to class

I see no reason to mix struct and class
1 job for master in 1 minute and 55 seconds (queued for 1 second)