refactoring

Signed-off-by: bomi1012 <bomi1012@hs-karlsruhe.de>