some cosmetic code changes