small part structure refactor