Add cosmetic changes phase 3