cleaned up cart model
further cleanup