Style/PEP8 improvements