move changes around to make diffs easier to read