Cleaned up use cases and Cart class