Refactoring of structure and details