More code cleanup
more code cleanup