Made Cluster API more robust
minor cleanup