Update code to use coding standards..