remove NSLog
improve location