Don't change order of methods for no reason: it just scrambles the diffs