(core_info.c) Some code cleanups