Move make combo function inside class