Formatting; updating from xmint