All PEP-8 except E501
Add some markup