Update cart class to be in line with DB and coding style