In order to keep the diff small and readable it might make sense to use a formatter at least for the master branch.