Refactor and -structuring