maintenance on #411 and #413 (#416)

* More consistent termination as requested in #411
* Fix issue #413, clustering now treats structures without energies correctly
* some refactoring on the respective routines

Author: pprcht