Test
Code cleanup