refactor part of the structure