Style updates - no functional changes

Without this patch, lint throws warnings.