test fix
Code cleanup