rebase -i: align variable names