Added divider line
Cleanup. Added 'command' as option.