Added comments and tabbing