Minor refactoring
Merge branch 'wp/refactoring/10'