Cleanup, added a more generalised ContentValues creation method.