general policy on combining formatting and code changes. Could you split into two commits?