Saner logging and cli messages