Cleaning up lint in the main dir

The commit below this should say "no one" in the message. I periodically
forget how to type in English.