PEP-8 cleanup pass
Change inner lists to ordered lists