Added comments
Updated method of loading data