Updated to conform with PEP8 style