Code cleanups on sysctl queue