Fixed code review issues

2 jobs for 1-certificate-authority in 3 minutes and 44 seconds