Clean up to use the standard style of "options \t" and "device\t\t"