Break this onto separate lines and rebase into a single commit please?