tidied up diffs for a cleaner PR