Refactoring (clean, method extract)