move to common
Refactoring, extract constant, #7