Refactor by Kuki