Some cosmetic changes to the code