some renames and formating
Replaced @synchronized with dispatch_queue_t