performing cleanup
some refactoring after adding cluster API capabilities... introduced health operation and unit tests