address comments
start cleaning up Cassandra client
more cleanup
more cleanup
more cleanup
more cleanup
more cleanup