Minor Code cleanups