Some cosmetic changes during the code review