Rakuten card refactoring