Refactoring captcha
Refactoring captcha