Some refactoring

- renaming function to better reflect purpose
- resolve clang-tidy warnings
- cleaning up, remove no longer needed includes

Signed-off-by: schroedtert <t.schroedter@fz-juelich.de>