Code style improvements.