Small changes to make code standard compliant.