Minor embellishments and PEP8 compliance.