Improvements to CAPTCHA section and linting