refactor

Signed-off-by: BKalali <BKalali@BKalali-PC>