Updates for code readability and PEP 8.