New line for messages, cleanup for cli