Small code cleaning
Some fixes. Created currentItem for setting the current item during makeTransform