More output beautification