create_cluster refactoring, new destroy_cluster and other proposed changes