Issue #152: formatting and small improvement.