Add cosmetic changes phase 4