WIP on refactoring for object-keys arrangement