Restructure: PEP8.