fix
make code liter and programmatically more readable + cleaning