Applying some coding standards from PEP8