Updated to comply with PEP8