1. clean the code
2. add support for <field-name>:<format> strings in pretty
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>