code cleanup, started work on DatastoreClient