you're right - for now, leave this as-is. sweeping style changes should be done in a separate branch.