I think the old formatting of this was better. It's hard to read if everything is merged.