[PATCH 3/6] Code cleanups