Refactorings,declared constants