Reformat to current standards
Correct to stricter standards