Fix-up formatting