Add captcha. Small refactoring.