BUGFIX: more unicode formatting cases treated

some code beautification