[Core] Slight cleanup