refractoring mod

Signed-off-by: AntonBoch1244 <AntonBoch12.44@gmail.com>