* changes: Clean up some of the Content Provider code. Reorganize some of the ContentProvider methods.