Object and global refactoring