Can we move each thing onto it's own line. It's becoming difficult to see diffs now.