Changes to match code standards.