Minor refactoring, added cart contents display.