Small improvements for readability and style standards.