do some more refactoring

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
more clean

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>