Made code follow coding standards.