Refactor with ecomba