refactoring

Signed-off-by: mrzl <marzzzel@gmail.com>