Code refactoring

No match.