more cosmetic code changes