comment
code cleanup
added minor Cluster option
todo++
comment