More code cleanup
More code cleanup