Sending location and refactoring