Updates and formatted as per PEP8