Refactoring, clear structure