Refactor for the structure 10%