cosmetic changes and implemented suggestions