Some cosmetic changes of the code