Refactor top-level object