Refactoring message location