Code clean up
More code clean up