location renamed, obsolete function calculateDistance removed
minor refactoring, #pragma mark..