fix
Code cleanup