Fixes: #2549 class certificate should follow code guidelines