minor constants refactoring