Reorder commits to match styleguide