Minor refactoring before attempting to change object designs