Slight cosmetic code changes.