Minor comment modifications, exception handling.
Renamed methods for the data container.