Annotation callbacks. Cleaned up comments, formatting and ARC compatibility.