Cleaned up content provider code. Following android dev instead of vogella