Refactoring , removed magic strings