PEP8 within reason ( 2 lines excepting )
Some PEP8 adjustments