[SRC] Code cleanups