Refactoring into constants