More cosmetic changes in the source code