issue #32 prettifiying (goes with a commit in OMA)