Weak refactoring #2