refactoring

Signed-off-by: r1ic00 <enni9095@gmail.com>