Minor cosmetic code changes