Refactoring : constants are now constant