issue1: some cosmetic changes