Minor improvements for code readability.