Code cleanups

Code cleanups

Code cleanups