keyboard stuff

Cleanup issues identified by lgtm (#14459) master

* cleanup issues identified by lgtm * fix the git_status check


+24 -42
17 changed files