fix
code cleanup