Fixes to apply PEP-8 convetions