Added comments and restructured Cart storage to be more extensible