a few more cosmetic code changes