Installments refactor