adding comments & proper tabbing