[Cleanup] Code cleanup.