Iget, Iput refactored