I've clean up these and the multiline sections with a couple of sidebars