Cosmetic small code changes