Code cleanups
Code cleanups