Improve Object.extend
Move code