Minor improvements in code readability.