Add cosmetic changes phase 1