Cosmetic changes. Related to ticket #224