Change certificate
Code refactoring