Some cosmetic changes and adaptations