[logging] Some polishing on the final solution