Add missing requires and PEP8ize.