Comments and Code cleanups