Refactoring of methods

Signed-off-by: Tim Rüther <tim@holosystems.de>