More code cleanup
Code cleanup
Code cleanup