Fix code to respect standards.