Prettified couple of lines as recommended in PR 2600