Refactoring and better naming of constants