[changes made, aesthetics improved]