Constants class + refactoring