Some changes
Some cosmetic changes