mostly cosmetic code changes