Refactor - Move code position